HDFS-16513. [SBN read] Observer Namenode does not trigger the edits r…

…olling of active Namenode
apache · Mar 21, 2022 · 0cf9128 · 0cf9128
1 parent 62d59e5
commit 0cf9128
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...roject/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/...roject/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -1938,6 +1938,14 @@ public boolean isInStandbyState() {
         HAServiceState.OBSERVER == haContext.getState().getServiceState();
   }
 
+  public boolean isInObserverState() {
+    if (haContext == null || haContext.getState() == null) {
+      return haEnabled;
+    }
+
+    return HAServiceState.OBSERVER == haContext.getState().getServiceState();
+  }
+
   /**
    * return a list of blocks &amp; their locations on {@code datanode} whose
    * total size is {@code size}

diff --git a/...ct/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java b/...ct/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java
@@ -505,7 +505,7 @@ private void doWork() {
           // read any more transactions since the last time a roll was
           // triggered.
           boolean triggeredLogRoll = false;
-          if (tooLongSinceLastLoad() &&
+          if (!namesystem.isInObserverState() && tooLongSinceLastLoad() &&
               lastRollTriggerTxId < lastLoadedTxnId) {
             triggerActiveLogRoll();
             triggeredLogRoll = true;