Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-13851. Remove AlignmentContext from AbstractNNFailoverProxyProvider. Contributed by Konstantin Shvachko.

This commit is contained in:
Konstantin V Shvachko 2018-08-23 18:00:19 -07:00
parent 66ec3a67e8
commit 25d8e39b5c
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/AbstractNNFailoverProxyProvider.java
View File

@ -34,7 +34,6 @@ import org.apache.hadoop.hdfs.DFSUtilClient;
import org.apache.hadoop.hdfs.HAUtilClient; import org.apache.hadoop.hdfs.HAUtilClient;
import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys; import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
import org.apache.hadoop.io.retry.FailoverProxyProvider; import org.apache.hadoop.io.retry.FailoverProxyProvider;
import org.apache.hadoop.ipc.AlignmentContext;
import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.UserGroupInformation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -107,11 +106,7 @@ public abstract class AbstractNNFailoverProxyProvider<T> implements
return fallbackToSimpleAuth; return fallbackToSimpleAuth;
} }
public synchronized AlignmentContext getAlignmentContext() { /**
return null; // by default the context is null
}
/**
* ProxyInfo to a NameNode. Includes its address. * ProxyInfo to a NameNode. Includes its address.
*/ */
public static class NNProxyInfo<T> extends ProxyInfo<T> { public static class NNProxyInfo<T> extends ProxyInfo<T> {

1
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java
View File

@ -113,7 +113,6 @@ public class ObserverReadProxyProvider<T extends ClientProtocol>
} }
} }
@Override
public synchronized AlignmentContext getAlignmentContext() { public synchronized AlignmentContext getAlignmentContext() {
return alignmentContext; return alignmentContext;
} }

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java
View File

@ -94,11 +94,6 @@ public class TestStateAlignmentContextWithHA {
AC_LIST.add(alignmentContext); AC_LIST.add(alignmentContext);
} }
@Override // AbstractNNFailoverProxyProvider
public synchronized ClientGSIContext getAlignmentContext() {
return this.alignmentContext;
}
} }
static class SpyConfiguredContextProxyProvider<T> static class SpyConfiguredContextProxyProvider<T>