HDFS-16689. Modify code based on comment

Author: ZanderXu

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java

@@ -1654,17 +1654,25 @@ synchronized void logEdit(final int length, final byte[] data) {
     endTransaction(start);
   }
 
+  void recoverUnclosedStreams() throws IOException {
+    recoverUnclosedStreams(false);
+  }
+
   /**
    * Run recovery on all journals to recover any unclosed segments
    */
-  synchronized void recoverUnclosedStreams() throws IOException {
+  synchronized void recoverUnclosedStreams(boolean terminateOnFailure) throws IOException {
     Preconditions.checkState(
         state == State.BETWEEN_LOG_SEGMENTS,
         "May not recover segments - wrong state: %s", state);
     try {
       journalSet.recoverUnfinalizedSegments();
     } catch (IOException ex) {
-      throw new UnrecoverEditsException("Failed recover unclosed segments", ex);
+      // All journals have failed, it is handled in logSync.
+      // TODO: are we sure this is OK?
+      if (terminateOnFailure) {
+        throw ex;
+      }
     }
   }
 

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java

@@ -175,11 +175,6 @@ protected FSImage(Configuration conf,
     archivalManager = new NNStorageRetentionManager(conf, storage, editLog);
     FSImageFormatProtobuf.initParallelLoad(conf);
   }
-
-  @VisibleForTesting
-  void setEditLog(FSEditLog editLog) {
-    this.editLog = editLog;
-  }
 
   void format(FSNamesystem fsn, String clusterId, boolean force)
       throws IOException {

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

@@ -136,7 +136,6 @@
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.VersionInfo;
 
-import static org.apache.hadoop.util.ExitUtil.terminate;
 import static org.apache.hadoop.util.Time.now;
 import static org.apache.hadoop.util.Time.monotonicNow;
 import static org.apache.hadoop.hdfs.server.namenode.top.metrics.TopMetrics.TOPMETRICS_METRICS_SOURCE_NAME;
@@ -1287,8 +1286,6 @@ void loadFSImage(StartupOption startOpt) throws IOException {
         fsImage.openEditLogForWrite(getEffectiveLayoutVersion());
       }
       success = true;
-    } catch (UnrecoverEditsException e) {
-      terminate(1, e.getLocalizedMessage());
     } finally {
       if (!success) {
         fsImage.close();
@@ -1392,7 +1389,7 @@ void startActiveServices() throws IOException {
         // During startup, we're already open for write during initialization.
         editLog.initJournalsForWrite();
         // May need to recover
-        editLog.recoverUnclosedStreams();
+        editLog.recoverUnclosedStreams(true);
 
         LOG.info("Catching up to latest edits from old active before " +
             "taking over writer role in edits logs");

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/UnrecoverEditsException.java

@@ -283,7 +283,7 @@ public void stop() throws IOException {
   }
 
   @VisibleForTesting
-  public FSEditLog getEditLog() {
+  FSEditLog getEditLog() {
     return editLog;
   }
 

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java

@@ -198,7 +198,8 @@ public void testMismatchedNNIsRejected() throws Exception {
           .build();
       fail("New NN with different namespace should have been rejected");
     } catch (ExitException ee) {
-      GenericTestUtils.assertExceptionContains("Failed recover unclosed segments", ee);
+      GenericTestUtils.assertExceptionContains(
+          "Unable to start log segment 1: too few journals", ee);
       assertTrue("Didn't terminate properly ", ExitUtil.terminateCalled());
     }
   }

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/TestNNWithQJM.java

@@ -20,6 +20,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hdfs.DFSConfigKeys;
+import org.apache.hadoop.hdfs.DFSTestUtil;
 import org.apache.hadoop.hdfs.HAUtil;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.qjournal.MiniJournalCluster;
@@ -99,7 +100,7 @@ private void spyFSEditLog() throws IOException {
     }
     ).when(spyEditLog).recoverUnclosedStreams();
 
-    nn1.getNamesystem().getFSImage().setEditLog(spyEditLog);
+    DFSTestUtil.setEditLogForTesting(nn1.getNamesystem(), spyEditLog);
     nn1.getNamesystem().getEditLogTailer().setEditLog(spyEditLog);
   }