fixed null pointer errors in scanners

Microsoft-CISL · Dec 29, 2015 · 5372a37 · 5372a37
1 parent 090add3
commit 5372a37
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...ct/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java b/...ct/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
@@ -813,8 +813,9 @@ public ScanInfoPerBlockPool call() throws IOException {
         throttleTimer.start();
 
         try {
-          result.put(bpid,
-              compileReport(volume, bpFinalizedDir, bpFinalizedDir, report));
+          if (bpFinalizedDir != null)
+            result.put(bpid,
+                compileReport(volume, bpFinalizedDir, bpFinalizedDir, report));
         } catch (InterruptedException ex) {
           // Exit quickly and flag the scanner to do the same
           result = null;

diff --git a/...dfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java b/...dfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java
@@ -593,13 +593,16 @@ private String getNextSubDir(String prev, File dir)
     }
 
     private String getNextFinalizedDir() throws IOException {
+      if (bpidDir == null)
+        return null;
+
       File dir = Paths.get(
           bpidDir.getAbsolutePath(), "current", "finalized").toFile();
       return getNextSubDir(state.curFinalizedDir, dir);
     }
 
     private String getNextFinalizedSubDir() throws IOException {
-      if (state.curFinalizedDir == null) {
+      if (state.curFinalizedDir == null || bpidDir == null) {
         return null;
       }
       File dir = Paths.get(
@@ -609,7 +612,7 @@ private String getNextFinalizedSubDir() throws IOException {
     }
 
     private List<String> getSubdirEntries() throws IOException {
-      if (state.curFinalizedSubDir == null) {
+      if (state.curFinalizedSubDir == null || bpidDir == null) {
         return null; // There are no entries in the null subdir.
       }
       long now = Time.monotonicNow();