HDFS-17444. Add getJournalSyncerStarted jmx metrics, to Indicates whe…

…ther the JournalSyncer thread has been started.
apache · Apr 1, 2024 · 745dd1f · 745dd1f
1 parent 5bfca65
commit 745dd1f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/...project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java b/...project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
@@ -405,6 +405,18 @@ public boolean accept(File file) {
     return JSON.toString(status);
   }
 
+  @Override // JournalNodeMXBean
+  public String getJournalSyncerStatus() {
+    StringBuilder sbuilder = new StringBuilder();
+    journalSyncersById.keySet().forEach((jid) ->
+        sbuilder.append(jid)
+            .append(","));
+    if (sbuilder.length() > 0) {
+      sbuilder.deleteCharAt(sbuilder.length() - 1);
+    }
+    return "[" + sbuilder.toString() + "]";
+  }
+
   @Override // JournalNodeMXBean
   public String getHostAndPort() {
     return NetUtils.getHostPortString(rpcServer.getAddress());

diff --git a/...t/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeMXBean.java b/...t/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeMXBean.java
@@ -36,6 +36,17 @@ public interface JournalNodeMXBean {
    */
   String getJournalsStatus();
 
+  /**
+   * Query JournalSyncer status.
+   *
+   * @return JournalSyncer status.
+   *
+   * example: "[ns1,ns3]" string means:
+   * JournalSyncer thread for ns1 and ns3 has enter working state,
+   * but for ns2 has not enter working state yet
+   */
+  String getJournalSyncerStatus();
+
   /**
    * Get host and port of JournalNode.
    *

diff --git a/...doop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java b/...doop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java
@@ -80,10 +80,21 @@ public void testJournalNodeMXBean() throws Exception {
     assertEquals(jn.getJournalsStatus(), journalStatus);
     assertFalse(journalStatus.contains(NAMESERVICE));
 
+    // getJournalSyncerStatus
+    String journalSyncerStarted = (String) mbs.getAttribute(mxbeanName,
+        "JournalSyncerStatus");
+    assertEquals(jn.getJournalSyncerStatus(), journalSyncerStarted);
+    assertFalse(journalSyncerStarted.contains(NAMESERVICE));
+
     // format the journal ns1
     final NamespaceInfo fakeNsInfo = new NamespaceInfo(NS_ID, "mycluster", "my-bp", 0L);
     jn.getOrCreateJournal(NAMESERVICE).format(fakeNsInfo, false);
 
+    // check again after getOrCreateJournal
+    journalSyncerStarted = (String) mbs.getAttribute(mxbeanName,
+        "JournalSyncerStatus");
+    assertTrue(journalSyncerStarted.contains(NAMESERVICE));
+
     // check again after format
     // getJournalsStatus
     journalStatus = (String) mbs.getAttribute(mxbeanName, "JournalsStatus");