From 47706668c5799a49ebc355c58eea05f21e4d39b7 Mon Sep 17 00:00:00 2001
From: Aravindan Vijayan <avijayan@hortonworks.com>
Date: Tue, 19 Feb 2019 11:38:30 -0800
Subject: [PATCH] Fix findbugs issues in HDDS-1085.

---
 .../hadoop/utils/db/RDBCheckpointManager.java       |  2 +-
 .../java/org/apache/hadoop/utils/db/RDBStore.java   |  5 ++++-
 .../main/java/org/apache/hadoop/ozone/OmUtils.java  | 13 +++++++++----
 .../apache/hadoop/ozone/om/OMDbSnapshotServlet.java |  4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBCheckpointManager.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBCheckpointManager.java
index fe43e32abf175..2ed2c59d66733 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBCheckpointManager.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBCheckpointManager.java
@@ -93,7 +93,7 @@ public RocksDBCheckpointSnapshot createCheckpointSnapshot(String parentDir)
     return null;
   }
 
-  class RocksDBCheckpointSnapshot implements DBCheckpointSnapshot {
+  static class RocksDBCheckpointSnapshot implements DBCheckpointSnapshot {
 
     private Path checkpointLocation;
     private long checkpointTimestamp;
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBStore.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBStore.java
index 6850eec85bb19..35b95b625f237 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBStore.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBStore.java
@@ -119,7 +119,10 @@ public RDBStore(File dbFile, DBOptions options, Set<TableConfig> families,
           OM_DB_CHECKPOINTS_DIR_NAME).toString();
       File checkpointsDir = new File(checkpointsParentDir);
       if (!checkpointsDir.exists()) {
-        checkpointsDir.mkdir();
+        boolean success = checkpointsDir.mkdir();
+        if (!success) {
+          LOG.warn("Unable to create RocksDB checkpoint directory");
+        }
       }
 
       //Initialize checkpoint manager
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
index 093fac2d43da5..9d33a9b482634 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
@@ -315,8 +315,10 @@ public static File createTarFile(Path sourcePath) throws IOException {
       tarOs = new TarArchiveOutputStream(gzipOutputStream);
       File folder = new File(sourceDir);
       File[] filesInDir = folder.listFiles();
-      for (File file : filesInDir) {
-        addFilesToArchive(file.getName(), file, tarOs);
+      if (filesInDir != null) {
+        for (File file : filesInDir) {
+          addFilesToArchive(file.getName(), file, tarOs);
+        }
       }
       return new File(fileName);
     } finally {
@@ -343,8 +345,11 @@ private static void addFilesToArchive(String source, File file,
       fileInputStream.close();
     } else if (file.isDirectory()) {
       tarFileOutputStream.closeArchiveEntry();
-      for (File cFile : file.listFiles()) {
-        addFilesToArchive(cFile.getAbsolutePath(), cFile, tarFileOutputStream);
+      File[] filesInDir = file.listFiles();
+      if (filesInDir != null) {
+        for (File cFile : filesInDir) {
+          addFilesToArchive(cFile.getAbsolutePath(), cFile, tarFileOutputStream);
+        }
       }
     }
   }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDbSnapshotServlet.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDbSnapshotServlet.java
index 287a6846a9c2a..166407d8a3a98 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDbSnapshotServlet.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDbSnapshotServlet.java
@@ -50,9 +50,10 @@ public class OMDbSnapshotServlet extends HttpServlet {
 
   private static final Logger LOG =
       LoggerFactory.getLogger(OMDbSnapshotServlet.class);
+  private static final long serialVersionUID = 1L;
 
   private transient DBStore omDbStore;
-  private DataTransferThrottler throttler = null;
+  private transient DataTransferThrottler throttler = null;
 
   @Override
   public void init() throws ServletException {
@@ -111,7 +112,6 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) {
         response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
         return;
       }
-      LOG.info("Tar location = " + checkPointTarFile.getAbsolutePath());
       checkPointTarFile = OmUtils.createTarFile(
           checkpoint.getCheckpointLocation());
       LOG.info("Tar location = " + checkPointTarFile.getAbsolutePath());