You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ay...@apache.org on 2020/01/11 04:56:17 UTC
[hadoop] branch trunk updated: HDFS-15108. RBF:
MembershipNamenodeResolver should invalidate cache incase of active
namenode update. Contributed by Ayush Saxena.
This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7b62409 HDFS-15108. RBF: MembershipNamenodeResolver should invalidate cache incase of active namenode update. Contributed by Ayush Saxena.
7b62409 is described below
commit 7b62409ace165603ee137561d7d75b1e742ed9a2
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Sat Jan 11 10:21:31 2020 +0530
HDFS-15108. RBF: MembershipNamenodeResolver should invalidate cache incase of active namenode update. Contributed by Ayush Saxena.
---
.../resolver/MembershipNamenodeResolver.java | 5 +++
.../federation/resolver/TestNamenodeResolver.java | 37 ++++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MembershipNamenodeResolver.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MembershipNamenodeResolver.java
index 4545cc5..6117e9a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MembershipNamenodeResolver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MembershipNamenodeResolver.java
@@ -161,6 +161,11 @@ public class MembershipNamenodeResolver
UpdateNamenodeRegistrationRequest.newInstance(
record.getNameserviceId(), record.getNamenodeId(), ACTIVE);
membership.updateNamenodeRegistration(updateRequest);
+
+ cacheNS.remove(nsId);
+ // Invalidating the full cacheBp since getting the blockpool id from
+ // namespace id is quite costly.
+ cacheBP.clear();
}
} catch (StateStoreUnavailableException e) {
LOG.error("Cannot update {} as active, State Store unavailable", address);
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/resolver/TestNamenodeResolver.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/resolver/TestNamenodeResolver.java
index 00c2c13..932c861 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/resolver/TestNamenodeResolver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/resolver/TestNamenodeResolver.java
@@ -33,6 +33,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.net.InetSocketAddress;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -281,4 +282,40 @@ public class TestNamenodeResolver {
verifyFirstRegistration(NAMESERVICES[0], NAMENODES[1], 3,
FederationNamenodeServiceState.STANDBY);
}
+
+ @Test
+ public void testCacheUpdateOnNamenodeStateUpdate() throws IOException {
+ // Create a namenode initially registering in standby state.
+ assertTrue(namenodeResolver.registerNamenode(
+ createNamenodeReport(NAMESERVICES[0], NAMENODES[0],
+ HAServiceState.STANDBY)));
+ stateStore.refreshCaches(true);
+ // Check whether the namenpde state is reported correct as standby.
+ FederationNamenodeContext namenode =
+ namenodeResolver.getNamenodesForNameserviceId(NAMESERVICES[0]).get(0);
+ assertEquals(FederationNamenodeServiceState.STANDBY, namenode.getState());
+ String rpcAddr = namenode.getRpcAddress();
+ InetSocketAddress inetAddr = getInetSocketAddress(rpcAddr);
+
+ // If the namenode state changes and it serves request,
+ // RouterRpcClient calls updateActiveNamenode to update the state to active,
+ // Check whether correct updated state is returned post update.
+ namenodeResolver.updateActiveNamenode(NAMESERVICES[0], inetAddr);
+ FederationNamenodeContext namenode1 =
+ namenodeResolver.getNamenodesForNameserviceId(NAMESERVICES[0]).get(0);
+ assertEquals("The namenode state should be ACTIVE post update.",
+ FederationNamenodeServiceState.ACTIVE, namenode1.getState());
+ }
+
+ /**
+ * Creates InetSocketAddress from the given RPC address.
+ * @param rpcAddr RPC address (host:port).
+ * @return InetSocketAddress corresponding to the specified RPC address.
+ */
+ private static InetSocketAddress getInetSocketAddress(String rpcAddr) {
+ String[] rpcAddrArr = rpcAddr.split(":");
+ int port = Integer.parseInt(rpcAddrArr[1]);
+ String hostname = rpcAddrArr[0];
+ return new InetSocketAddress(hostname, port);
+ }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org