HDFS-13851. Remove AlignmentContext from AbstractNNFailoverProxyProvider. Contributed by Konstantin Shvachko.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/25d8e39b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/25d8e39b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/25d8e39b Branch: refs/heads/trunk Commit: 25d8e39b5c7477338344a8d9aadd100cd08cd9a5 Parents: 66ec3a6 Author: Konstantin V Shvachko <[email protected]> Authored: Thu Aug 23 18:00:19 2018 -0700 Committer: Konstantin V Shvachko <[email protected]> Committed: Mon Dec 24 09:34:00 2018 -0800 ---------------------------------------------------------------------- .../server/namenode/ha/AbstractNNFailoverProxyProvider.java | 7 +------ .../hdfs/server/namenode/ha/ObserverReadProxyProvider.java | 1 - .../apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java | 5 ----- 3 files changed, 1 insertion(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/25d8e39b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/AbstractNNFailoverProxyProvider.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/AbstractNNFailoverProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/AbstractNNFailoverProxyProvider.java index 1cf00cf..252b70d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/AbstractNNFailoverProxyProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/AbstractNNFailoverProxyProvider.java @@ -34,7 +34,6 @@ import org.apache.hadoop.hdfs.DFSUtilClient; import org.apache.hadoop.hdfs.HAUtilClient; import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys; import org.apache.hadoop.io.retry.FailoverProxyProvider; -import org.apache.hadoop.ipc.AlignmentContext; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -107,11 +106,7 @@ public abstract class AbstractNNFailoverProxyProvider<T> implements return fallbackToSimpleAuth; } - public synchronized AlignmentContext getAlignmentContext() { - return null; // by default the context is null - } - - /** + /** * ProxyInfo to a NameNode. Includes its address. */ public static class NNProxyInfo<T> extends ProxyInfo<T> { http://git-wip-us.apache.org/repos/asf/hadoop/blob/25d8e39b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java index 25035ab..754fea4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java @@ -113,7 +113,6 @@ public class ObserverReadProxyProvider<T extends ClientProtocol> } } - @Override public synchronized AlignmentContext getAlignmentContext() { return alignmentContext; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/25d8e39b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java index ae82881..1acbd75 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java @@ -94,11 +94,6 @@ public class TestStateAlignmentContextWithHA { AC_LIST.add(alignmentContext); } - - @Override // AbstractNNFailoverProxyProvider - public synchronized ClientGSIContext getAlignmentContext() { - return this.alignmentContext; - } } static class SpyConfiguredContextProxyProvider<T> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
