HDFS-17133: TestFsDatasetImpl missing null check when cleaning up (#6079). Contributed by ConfX.

teamconfx · web-flow · commit 8931393302c6 · 2023-09-29T12:06:24.000+05:30
Signed-off-by: Ayush Saxena &lt;ayushsaxena@apache.org&gt;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
@@ -1173,7 +1173,7 @@ private void testMoveBlockFailure(Configuration config) {
       LOG.info("Exception in testMoveBlockFailure ", ex);
       fail("Exception while testing testMoveBlockFailure ");
     } finally {
-      if (cluster.isClusterUp()) {
+      if (cluster != null && cluster.isClusterUp()) {
         cluster.shutdown();
       }
     }
@@ -1984,4 +1984,4 @@ public void tesInvalidateMissingBlock() throws Exception {
       cluster.shutdown();
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1173,7 +1173,7 @@ private void testMoveBlockFailure(Configuration config) {`
`1173`	`1173`	`LOG.info("Exception in testMoveBlockFailure ", ex);`
`1174`	`1174`	`fail("Exception while testing testMoveBlockFailure ");`
`1175`	`1175`	`} finally {`
`1176`		`- if (cluster.isClusterUp()) {`
	`1176`	`+ if (cluster != null && cluster.isClusterUp()) {`
`1177`	`1177`	`cluster.shutdown();`
`1178`	`1178`	`}`
`1179`	`1179`	`}`
`@@ -1984,4 +1984,4 @@ public void tesInvalidateMissingBlock() throws Exception {`
`1984`	`1984`	`cluster.shutdown();`
`1985`	`1985`	`}`
`1986`	`1986`	`}`
`1987`		`-}`
	`1987`	`+}`