This is an automated email from the ASF dual-hosted git repository.
inigoiri pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 6b9cfe46909 HDFS-17055 Export HAState as a metric from Namenode for
monitoring (#5790)
6b9cfe46909 is described below
commit 6b9cfe469092363a99f2b36cd31a46c6b18e96b0
Author: Xing Lin <linxing...@gmail.com>
AuthorDate: Mon Jul 3 08:46:21 2023 -0700
HDFS-17055 Export HAState as a metric from Namenode for monitoring (#5790)
---
.../hadoop/hdfs/server/namenode/BackupNode.java | 2 +
.../hadoop/hdfs/server/namenode/NameNode.java | 25 ++++++++++
.../org/apache/hadoop/hdfs/TestDFSFinalize.java | 2 +-
.../org/apache/hadoop/hdfs/TestDFSRollback.java | 2 +-
.../org/apache/hadoop/hdfs/TestDFSUpgrade.java | 4 +-
.../server/namenode/TestNameNodeMetricsLogger.java | 2 +
.../hdfs/server/namenode/ha/TestHAMetrics.java | 55 ++++++++++++++++++++++
7 files changed, 88 insertions(+), 4 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java
index dab227fcc76..8db1926f511 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java
@@ -48,6 +48,7 @@ import
org.apache.hadoop.hdfs.server.protocol.NamenodeRegistration;
import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
import org.apache.hadoop.ipc.StandbyException;
import org.apache.hadoop.ipc.RPC;
+import org.apache.hadoop.metrics2.annotation.Metrics;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.UserGroupInformation;
@@ -68,6 +69,7 @@ import org.apache.hadoop.thirdparty.protobuf.BlockingService;
* </ol>
*/
@InterfaceAudience.Private
+@Metrics(context="dfs")
public class BackupNode extends NameNode {
private static final String BN_ADDRESS_NAME_KEY =
DFSConfigKeys.DFS_NAMENODE_BACKUP_ADDRESS_KEY;
private static final String BN_ADDRESS_DEFAULT =
DFSConfigKeys.DFS_NAMENODE_BACKUP_ADDRESS_DEFAULT;
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
index 62a35c201ba..c9beb338a72 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
@@ -78,6 +78,8 @@ import org.apache.hadoop.ipc.RefreshCallQueueProtocol;
import org.apache.hadoop.ipc.RetriableException;
import org.apache.hadoop.ipc.Server;
import org.apache.hadoop.ipc.StandbyException;
+import org.apache.hadoop.metrics2.annotation.Metric;
+import org.apache.hadoop.metrics2.annotation.Metrics;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.metrics2.util.MBeans;
import org.apache.hadoop.net.NetUtils;
@@ -246,6 +248,7 @@ import static
org.apache.hadoop.fs.CommonConfigurationKeys.IPC_BACKOFF_ENABLE_DE
* NameNode state, for example partial blocksMap etc.
**********************************************************/
@InterfaceAudience.Private
+@Metrics(context="dfs")
public class NameNode extends ReconfigurableBase implements
NameNodeStatusMXBean, TokenVerifier<DelegationTokenIdentifier> {
static{
@@ -1049,6 +1052,7 @@ public class NameNode extends ReconfigurableBase
implements
DFS_HA_NN_NOT_BECOME_ACTIVE_IN_SAFEMODE,
DFS_HA_NN_NOT_BECOME_ACTIVE_IN_SAFEMODE_DEFAULT);
this.started.set(true);
+ DefaultMetricsSystem.instance().register(this);
}
private void stopAtException(Exception e){
@@ -1119,6 +1123,7 @@ public class NameNode extends ReconfigurableBase
implements
levelDBAliasMapServer.close();
}
}
+ started.set(false);
tracer.close();
}
@@ -1951,6 +1956,26 @@ public class NameNode extends ReconfigurableBase
implements
return state.getServiceState();
}
+ /**
+ * Emit Namenode HA service state as an integer so that one can monitor NN HA
+ * state based on this metric.
+ *
+ * @return 0 when not fully started
+ * 1 for active or standalone (non-HA) NN
+ * 2 for standby
+ * 3 for observer
+ *
+ * These are the same integer values for the HAServiceState enum.
+ */
+ @Metric({"NameNodeState", "Namenode HA service state"})
+ public int getNameNodeState() {
+ if (!isStarted() || state == null) {
+ return HAServiceState.INITIALIZING.ordinal();
+ }
+
+ return state.getServiceState().ordinal();
+ }
+
/**
* Register NameNodeStatusMXBean
*/
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSFinalize.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSFinalize.java
index a9d97cfc297..e39cce926c6 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSFinalize.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSFinalize.java
@@ -154,7 +154,7 @@ public class TestDFSFinalize {
UpgradeUtilities.createEmptyDirs(dataNodeDirs);
log("Finalize NN & BP with existing previous dir", numDirs);
- String bpid = UpgradeUtilities.getCurrentBlockPoolID(cluster);
+ String bpid = UpgradeUtilities.getCurrentBlockPoolID(null);
UpgradeUtilities.createNameNodeStorageDirs(nameNodeDirs, "current");
UpgradeUtilities.createNameNodeStorageDirs(nameNodeDirs, "previous");
UpgradeUtilities.createDataNodeStorageDirs(dataNodeDirs, "current");
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRollback.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRollback.java
index cc158877a38..212e37f248f 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRollback.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRollback.java
@@ -327,7 +327,7 @@ public class TestDFSRollback {
UpgradeUtilities.getCurrentFsscTime(null), NodeType.NAME_NODE);
UpgradeUtilities.createNameNodeVersionFile(conf, baseDirs,
- storageInfo, UpgradeUtilities.getCurrentBlockPoolID(cluster));
+ storageInfo, UpgradeUtilities.getCurrentBlockPoolID(null));
startNameNodeShouldFail("Cannot rollback to storage version 1 using this
version");
UpgradeUtilities.createEmptyDirs(nameNodeDirs);
} // end numDir loop
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUpgrade.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUpgrade.java
index 77cae4f0e68..efb7910ac15 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUpgrade.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUpgrade.java
@@ -348,7 +348,7 @@ public class TestDFSUpgrade {
UpgradeUtilities.getCurrentFsscTime(null), NodeType.NAME_NODE);
UpgradeUtilities.createNameNodeVersionFile(conf, baseDirs, storageInfo,
- UpgradeUtilities.getCurrentBlockPoolID(cluster));
+ UpgradeUtilities.getCurrentBlockPoolID(null));
startNameNodeShouldFail(StartupOption.UPGRADE);
UpgradeUtilities.createEmptyDirs(nameNodeDirs);
@@ -361,7 +361,7 @@ public class TestDFSUpgrade {
UpgradeUtilities.getCurrentFsscTime(null), NodeType.NAME_NODE);
UpgradeUtilities.createNameNodeVersionFile(conf, baseDirs, storageInfo,
- UpgradeUtilities.getCurrentBlockPoolID(cluster));
+ UpgradeUtilities.getCurrentBlockPoolID(null));
startNameNodeShouldFail(StartupOption.UPGRADE);
UpgradeUtilities.createEmptyDirs(nameNodeDirs);
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMetricsLogger.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMetricsLogger.java
index 9b5e9884c52..527bdac7ef7 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMetricsLogger.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMetricsLogger.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.hdfs.server.namenode;
import java.util.function.Supplier;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.Log4JLogger;
+import org.apache.hadoop.metrics2.annotation.Metrics;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
@@ -128,6 +129,7 @@ public class TestNameNodeMetricsLogger {
/**
* A NameNode that stubs out the NameSystem for testing.
*/
+ @Metrics(context="dfs")
private static class TestNameNode extends NameNode {
@Override
protected void loadNamesystem(Configuration conf) throws IOException {
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHAMetrics.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHAMetrics.java
index c1a78815dc9..4c71c9a8103 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHAMetrics.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHAMetrics.java
@@ -17,6 +17,8 @@
*/
package org.apache.hadoop.hdfs.server.namenode.ha;
+import java.io.IOException;
+import org.apache.hadoop.ha.HAServiceProtocol;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
@@ -29,6 +31,7 @@ import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.MiniDFSNNTopology;
import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.io.IOUtils;
import org.junit.Test;
@@ -176,4 +179,56 @@ public class TestHAMetrics {
}
}
+
+ /**
+ * Test the getNameNodeState() API added to NameNode.java.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testGetNameNodeState() throws IOException {
+ Configuration conf = new Configuration();
+ conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_PERIOD_KEY, 1);
+ conf.setInt(DFSConfigKeys.DFS_HA_LOGROLL_PERIOD_KEY, Integer.MAX_VALUE);
+
+ MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).nnTopology(
+ MiniDFSNNTopology.simpleHATopology(3)).numDataNodes(1).build();
+
+ cluster.waitActive();
+
+ NameNode nn0 = cluster.getNameNode(0);
+ NameNode nn1 = cluster.getNameNode(1);
+ NameNode nn2 = cluster.getNameNode(2);
+
+ // All namenodes are in standby by default
+ assertEquals(HAServiceProtocol.HAServiceState.STANDBY.ordinal(),
+ nn0.getNameNodeState());
+ assertEquals(HAServiceProtocol.HAServiceState.STANDBY.ordinal(),
+ nn1.getNameNodeState());
+ assertEquals(HAServiceProtocol.HAServiceState.STANDBY.ordinal(),
+ nn2.getNameNodeState());
+
+ // Transition nn0 to be active
+ cluster.transitionToActive(0);
+ assertEquals(HAServiceProtocol.HAServiceState.ACTIVE.ordinal(),
+ nn0.getNameNodeState());
+
+ // Transition nn1 to be active
+ cluster.transitionToStandby(0);
+ cluster.transitionToActive(1);
+ assertEquals(HAServiceProtocol.HAServiceState.STANDBY.ordinal(),
+ nn0.getNameNodeState());
+ assertEquals(HAServiceProtocol.HAServiceState.ACTIVE.ordinal(),
+ nn1.getNameNodeState());
+
+ // Transition nn2 to observer
+ cluster.transitionToObserver(2);
+ assertEquals(HAServiceProtocol.HAServiceState.OBSERVER.ordinal(),
+ nn2.getNameNodeState());
+
+ // Shutdown nn2. Now getNameNodeState should return the INITIALIZING state.
+ cluster.shutdownNameNode(2);
+ assertEquals(HAServiceProtocol.HAServiceState.INITIALIZING.ordinal(),
+ nn2.getNameNodeState());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
