HDFS-12501. Ozone: Cleanup javac issues. Contributed by Yiqun Lin.

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerStorageLocation.java

@@ -114,7 +114,7 @@ public class ContainerStorageLocation {
     scmUsedSaved = true;
 
     if (scmUsage instanceof CachingGetSpaceUsed) {
-      IOUtils.cleanup(null, ((CachingGetSpaceUsed) scmUsage));
+      IOUtils.cleanupWithLogger(null, ((CachingGetSpaceUsed) scmUsage));
     }
   }
 
@@ -185,7 +185,7 @@ public class ContainerStorageLocation {
       // not critical, log the error and continue.
       LOG.warn("Failed to write scmUsed to " + scmUsedFile, ioe);
     } finally {
-      IOUtils.cleanup(null, out);
+      IOUtils.cleanupWithLogger(null, out);
     }
   }
 }

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/CloseableCleanupListener.java

@@ -41,6 +41,6 @@ final class CloseableCleanupListener implements ChannelFutureListener {
 
   @Override
   public void operationComplete(ChannelFuture future) {
-    IOUtils.cleanup(null, closeables);
+    IOUtils.cleanupWithLogger(null, closeables);
   }
 }

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/ObjectStoreJerseyContainer.java

@@ -235,7 +235,7 @@ public final class ObjectStoreJerseyContainer {
         this.exception = e;
         this.latch.countDown();
       } finally {
-        IOUtils.cleanup(null, this.reqIn, this.respOut);
+        IOUtils.cleanupWithLogger(null, this.reqIn, this.respOut);
         StorageHandlerBuilder.removeStorageHandler();
       }
       LOG.trace("end RequestRunner, nettyReq = {}", this.nettyReq);
@@ -281,7 +281,7 @@ public final class ObjectStoreJerseyContainer {
      */
     @Override
     public void finish() throws IOException {
-      IOUtils.cleanup(null, this.respOut);
+      IOUtils.cleanupWithLogger(null, this.respOut);
     }
 
     /**

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/RequestContentObjectStoreChannelHandler.java

@@ -80,7 +80,7 @@ public final class RequestContentObjectStoreChannelHandler
         "ctx = {}, content = {}", ctx, content);
     content.content().readBytes(this.reqOut, content.content().readableBytes());
     if (content instanceof LastHttpContent) {
-      IOUtils.cleanup(null, this.reqOut);
+      IOUtils.cleanupWithLogger(null, this.reqOut);
       ctx.write(this.nettyResp.get());
       ChannelFuture respFuture = ctx.writeAndFlush(new ChunkedStream(
           this.respIn));
@@ -112,6 +112,6 @@ public final class RequestContentObjectStoreChannelHandler
   @Override
   public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
     super.exceptionCaught(ctx, cause);
-    IOUtils.cleanup(null, this.reqOut, this.respIn);
+    IOUtils.cleanupWithLogger(null, this.reqOut, this.respIn);
   }
 }

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/RequestDispatchObjectStoreChannelHandler.java

@@ -97,6 +97,7 @@ public final class RequestDispatchObjectStoreChannelHandler
   @Override
   public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
     super.exceptionCaught(ctx, cause);
-    IOUtils.cleanup(null, this.reqIn, this.reqOut, this.respIn, this.respOut);
+    IOUtils.cleanupWithLogger(null, this.reqIn, this.reqOut, this.respIn,
+        this.respOut);
   }
 }

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java

@@ -41,9 +41,9 @@ import org.apache.hadoop.ozone.scm.StorageContainerManager;
 import org.apache.hadoop.ozone.web.exceptions.OzoneException;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.test.GenericTestUtils;
-import org.apache.log4j.Level;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -512,11 +512,9 @@ public final class MiniOzoneCluster extends MiniDFSCluster
       if (enableTrace.isPresent()) {
         conf.setBoolean(OzoneConfigKeys.OZONE_TRACE_ENABLED_KEY,
             enableTrace.get());
-        GenericTestUtils.setLogLevel(org.apache.log4j.Logger.getRootLogger(),
-            Level.ALL);
+        GenericTestUtils.setRootLogLevel(Level.TRACE);
       }
-      GenericTestUtils.setLogLevel(org.apache.log4j.Logger.getRootLogger(),
-          Level.INFO);
+      GenericTestUtils.setRootLogLevel(Level.INFO);
     }
 
     private void configureSCMheartbeat() {

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java

@@ -152,7 +152,7 @@ public class TestStorageContainerManager {
         }
       }
     } finally {
-      IOUtils.cleanup(null, cluster);
+      IOUtils.cleanupWithLogger(null, cluster);
     }
   }
 

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java

@@ -65,7 +65,7 @@ public class TestAllocateContainer {
     if(cluster != null) {
       cluster.shutdown();
     }
-    IOUtils.cleanup(null, storageContainerLocationClient, cluster);
+    IOUtils.cleanupWithLogger(null, storageContainerLocationClient, cluster);
   }
 
   @Test

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java

@@ -165,7 +165,7 @@ public class TestContainerSQLCli {
 
   @After
   public void shutdown() throws InterruptedException {
-    IOUtils.cleanup(null, storageContainerLocationClient, cluster);
+    IOUtils.cleanupWithLogger(null, storageContainerLocationClient, cluster);
   }
 
   @Test

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java

@@ -75,7 +75,7 @@ public class TestContainerSmallFile {
     if (cluster != null) {
       cluster.shutdown();
     }
-    IOUtils.cleanup(null, storageContainerLocationClient, cluster);
+    IOUtils.cleanupWithLogger(null, storageContainerLocationClient, cluster);
   }
 
   @Test

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java

@@ -119,7 +119,7 @@ public class TestSCMCli {
 
   @AfterClass
   public static void shutdown() throws InterruptedException {
-    IOUtils.cleanup(null, storageContainerLocationClient, cluster);
+    IOUtils.cleanupWithLogger(null, storageContainerLocationClient, cluster);
   }
 
   @Test

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java

@@ -72,7 +72,7 @@ public class TestSCMMXBean {
 
   @AfterClass
   public static void shutdown() {
-    IOUtils.cleanup(null, cluster);
+    IOUtils.cleanupWithLogger(null, cluster);
   }
 
   @Test

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java

@@ -66,7 +66,7 @@ public class TestXceiverClientManager {
 
   @AfterClass
   public static void shutdown() {
-    IOUtils.cleanup(null, cluster, storageContainerLocationClient);
+    IOUtils.cleanupWithLogger(null, cluster, storageContainerLocationClient);
   }
 
   @Test

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/web/TestOzoneRestWithMiniCluster.java

@@ -68,7 +68,7 @@ public class TestOzoneRestWithMiniCluster {
 
   @AfterClass
   public static void shutdown() throws InterruptedException {
-    IOUtils.cleanup(null, ozoneClient, cluster);
+    IOUtils.cleanupWithLogger(null, ozoneClient, cluster);
   }
 
   @Test