From 405f6b6fbf5319e920ba190ed63a97dec4fa2b7e Mon Sep 17 00:00:00 2001 From: Konstantin V Shvachko Date: Fri, 29 Jun 2018 15:50:37 -0700 Subject: [PATCH] HDFS-13706. [SBN read] Rename client context to ClientGSIContext. Contributed by Konstantin Shvachko. --- ...tGCIContext.java => ClientGSIContext.java} | 4 ++- .../hdfs/TestStateAlignmentContextWithHA.java | 28 +++++++++---------- 2 files changed, 17 insertions(+), 15 deletions(-) rename hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/{ClientGCIContext.java => ClientGSIContext.java} (96%) diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientGCIContext.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientGSIContext.java similarity index 96% rename from hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientGCIContext.java rename to hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientGSIContext.java index 0d0bd251425..6f69eedf041 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientGCIContext.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientGSIContext.java @@ -27,12 +27,14 @@ import org.apache.hadoop.ipc.protobuf.RpcHeaderProtos.RpcResponseHeaderProto; import java.util.concurrent.atomic.LongAccumulator; /** + * Global State Id context for the client. + *

* This is the client side implementation responsible for receiving * state alignment info from server(s). */ @InterfaceAudience.Private @InterfaceStability.Stable -class ClientGCIContext implements AlignmentContext { +class ClientGSIContext implements AlignmentContext { private final LongAccumulator lastSeenStateId = new LongAccumulator(Math::max, Long.MIN_VALUE); 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 3437bb0a10f..00ed6bcf1ac 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 @@ -67,11 +67,11 @@ public class TestStateAlignmentContextWithHA { private static final int NUMFILES = 300; private static final Configuration CONF = new HdfsConfiguration(); private static final String NAMESERVICE = "nameservice"; - private static final List AC_LIST = new ArrayList<>(); + private static final List AC_LIST = new ArrayList<>(); private static MiniDFSCluster cluster; private static List clients; - private static ClientGCIContext spy; + private static ClientGSIContext spy; private DistributedFileSystem dfs; private int active = 0; @@ -80,7 +80,7 @@ public class TestStateAlignmentContextWithHA { static class AlignmentContextProxyProvider extends ConfiguredFailoverProxyProvider { - private ClientGCIContext alignmentContext; + private ClientGSIContext alignmentContext; public AlignmentContextProxyProvider( Configuration conf, URI uri, Class xface, @@ -89,14 +89,14 @@ public class TestStateAlignmentContextWithHA { // Create and set AlignmentContext in HAProxyFactory. // All proxies by factory will now have AlignmentContext assigned. - this.alignmentContext = (spy != null ? spy : new ClientGCIContext()); + this.alignmentContext = (spy != null ? spy : new ClientGSIContext()); ((ClientHAProxyFactory) factory).setAlignmentContext(alignmentContext); AC_LIST.add(alignmentContext); } @Override // AbstractNNFailoverProxyProvider - public synchronized ClientGCIContext getAlignmentContext() { + public synchronized ClientGSIContext getAlignmentContext() { return this.alignmentContext; } } @@ -104,7 +104,7 @@ public class TestStateAlignmentContextWithHA { static class SpyConfiguredContextProxyProvider extends ConfiguredFailoverProxyProvider { - private ClientGCIContext alignmentContext; + private ClientGSIContext alignmentContext; public SpyConfiguredContextProxyProvider( Configuration conf, URI uri, Class xface, @@ -112,7 +112,7 @@ public class TestStateAlignmentContextWithHA { super(conf, uri, xface, factory); // Create but DON'T set in HAProxyFactory. - this.alignmentContext = (spy != null ? spy : new ClientGCIContext()); + this.alignmentContext = (spy != null ? spy : new ClientGSIContext()); AC_LIST.add(alignmentContext); } @@ -180,7 +180,7 @@ public class TestStateAlignmentContextWithHA { try (DistributedFileSystem clearDfs = (DistributedFileSystem) FileSystem.get(confCopy)) { - ClientGCIContext clientState = getContext(1); + ClientGSIContext clientState = getContext(1); assertThat(clientState.getLastSeenStateId(), is(Long.MIN_VALUE)); DFSTestUtil.writeFile(clearDfs, new Path("/testFileNoState"), "no_state"); assertThat(clientState.getLastSeenStateId(), is(Long.MIN_VALUE)); @@ -231,7 +231,7 @@ public class TestStateAlignmentContextWithHA { cluster.getNamesystem(active).getLastWrittenTransactionId(); try (DistributedFileSystem clearDfs = (DistributedFileSystem) FileSystem.get(CONF)) { - ClientGCIContext clientState = getContext(1); + ClientGSIContext clientState = getContext(1); assertThat(clientState.getLastSeenStateId(), is(Long.MIN_VALUE)); DFSTestUtil.readFile(clearDfs, new Path("/testFile3")); assertThat(clientState.getLastSeenStateId(), is(lastWrittenId)); @@ -244,8 +244,8 @@ public class TestStateAlignmentContextWithHA { */ @Test public void testClientSendsState() throws Exception { - ClientGCIContext alignmentContext = new ClientGCIContext(); - ClientGCIContext spiedAlignContext = Mockito.spy(alignmentContext); + ClientGSIContext alignmentContext = new ClientGSIContext(); + ClientGSIContext spiedAlignContext = Mockito.spy(alignmentContext); spy = spiedAlignContext; try (DistributedFileSystem clearDfs = @@ -286,8 +286,8 @@ public class TestStateAlignmentContextWithHA { */ @Test public void testClientSendsGreaterState() throws Exception { - ClientGCIContext alignmentContext = new ClientGCIContext(); - ClientGCIContext spiedAlignContext = Mockito.spy(alignmentContext); + ClientGSIContext alignmentContext = new ClientGSIContext(); + ClientGSIContext spiedAlignContext = Mockito.spy(alignmentContext); spy = spiedAlignContext; try (DistributedFileSystem clearDfs = @@ -377,7 +377,7 @@ public class TestStateAlignmentContextWithHA { } } - private ClientGCIContext getContext(int clientCreationIndex) { + private ClientGSIContext getContext(int clientCreationIndex) { return AC_LIST.get(clientCreationIndex); }