HDFS-16689. Fix failed UT: testMismatchedNNIsRejected

ZanderXu · ZanderXu · commit 39df92779065 · 2022-12-02T08:37:53.000+08:00
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/TestNNWithQJM.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/TestNNWithQJM.java
@@ -197,10 +197,9 @@ public void testMismatchedNNIsRejected() throws Exception {
           .manageNameDfsDirs(false).format(false).checkExitOnShutdown(false)
           .build();
       fail("New NN with different namespace should have been rejected");
-    } catch (ExitException ee) {
+    } catch (IOException ioe) {
       GenericTestUtils.assertExceptionContains(
-          "Unable to start log segment 1: too few journals", ee);
-      assertTrue("Didn't terminate properly ", ExitUtil.terminateCalled());
+          "recoverUnfinalizedSegments failed for too many journals", ioe);
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -197,10 +197,9 @@ public void testMismatchedNNIsRejected() throws Exception {`
`197`	`197`	`.manageNameDfsDirs(false).format(false).checkExitOnShutdown(false)`
`198`	`198`	`.build();`
`199`	`199`	`fail("New NN with different namespace should have been rejected");`
`200`		`- } catch (ExitException ee) {`
	`200`	`+ } catch (IOException ioe) {`
`201`	`201`	`GenericTestUtils.assertExceptionContains(`
`202`		`- "Unable to start log segment 1: too few journals", ee);`
`203`		`- assertTrue("Didn't terminate properly ", ExitUtil.terminateCalled());`
	`202`	`+ "recoverUnfinalizedSegments failed for too many journals", ioe);`
`204`	`203`	`}`
`205`	`204`	`}`
`206`	`205`	`}`