hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aengin...@apache.org
Subject hadoop git commit: HDFS-12501. Ozone: Cleanup javac issues. Contributed by Yiqun Lin.
Date Wed, 27 Sep 2017 16:58:47 GMT
Repository: hadoop
Updated Branches:
  refs/heads/HDFS-7240 ea4751902 -> fec0e745e


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fec0e745
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fec0e745
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fec0e745

Branch: refs/heads/HDFS-7240
Commit: fec0e745e2bbde06192d5f966443dfa9f1754949
Parents: ea47519
Author: Anu Engineer <aengineer@apache.org>
Authored: Wed Sep 27 09:54:16 2017 -0700
Committer: Anu Engineer <aengineer@apache.org>
Committed: Wed Sep 27 09:54:16 2017 -0700

----------------------------------------------------------------------
 .../container/common/impl/ContainerStorageLocation.java      | 4 ++--
 .../hadoop/ozone/web/netty/CloseableCleanupListener.java     | 2 +-
 .../hadoop/ozone/web/netty/ObjectStoreJerseyContainer.java   | 4 ++--
 .../web/netty/RequestContentObjectStoreChannelHandler.java   | 4 ++--
 .../web/netty/RequestDispatchObjectStoreChannelHandler.java  | 3 ++-
 .../test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java  | 8 +++-----
 .../org/apache/hadoop/ozone/TestStorageContainerManager.java | 2 +-
 .../org/apache/hadoop/ozone/scm/TestAllocateContainer.java   | 2 +-
 .../org/apache/hadoop/ozone/scm/TestContainerSQLCli.java     | 2 +-
 .../org/apache/hadoop/ozone/scm/TestContainerSmallFile.java  | 2 +-
 .../test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java    | 2 +-
 .../test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java | 2 +-
 .../apache/hadoop/ozone/scm/TestXceiverClientManager.java    | 2 +-
 .../hadoop/ozone/web/TestOzoneRestWithMiniCluster.java       | 2 +-
 14 files changed, 20 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerStorageLocation.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerStorageLocation.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerStorageLocation.java
index 17f027b..ebf0bf8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerStorageLocation.java
+++ b/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);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/CloseableCleanupListener.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/CloseableCleanupListener.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/CloseableCleanupListener.java
index eac8e6f..3d9db20 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/CloseableCleanupListener.java
+++ b/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);
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/ObjectStoreJerseyContainer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/ObjectStoreJerseyContainer.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/ObjectStoreJerseyContainer.java
index 40d60e3..c7b516f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/ObjectStoreJerseyContainer.java
+++ b/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);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/RequestContentObjectStoreChannelHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/RequestContentObjectStoreChannelHandler.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/RequestContentObjectStoreChannelHandler.java
index 501d719..0a2f22d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/RequestContentObjectStoreChannelHandler.java
+++ b/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);
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/RequestDispatchObjectStoreChannelHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/RequestDispatchObjectStoreChannelHandler.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/RequestDispatchObjectStoreChannelHandler.java
index f08ddc1..add827a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/netty/RequestDispatchObjectStoreChannelHandler.java
+++ b/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);
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
index d43fa52..0aa7d65 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
+++ b/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() {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java
index d0c363d..fe5af0e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java
+++ b/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);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java
index 8a9645a..c18b220 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java
+++ b/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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java
index 1101f39..e61a6ec 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java
+++ b/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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java
index 53b8e4a..b64da51 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java
+++ b/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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java
index 94c3c05..54ba8c8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java
+++ b/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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java
index b97e420..83f66e0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java
+++ b/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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java
index 8e6b2d8..c90eb18 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java
+++ b/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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fec0e745/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/web/TestOzoneRestWithMiniCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/web/TestOzoneRestWithMiniCluster.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/web/TestOzoneRestWithMiniCluster.java
index ae164bd..fd0b220 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/web/TestOzoneRestWithMiniCluster.java
+++ b/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


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message