Repository: hadoop Updated Branches: refs/heads/trunk 8faf0b50d -> 996796f10
HADOOP-15214. Make Hadoop compatible with Guava 21.0. Contributed by Igor Dvorzhak Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/996796f1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/996796f1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/996796f1 Branch: refs/heads/trunk Commit: 996796f1048369e0f307f935ba01af64cc751a85 Parents: 8faf0b5 Author: Steve Loughran <[email protected]> Authored: Thu Feb 8 10:55:54 2018 -0800 Committer: Steve Loughran <[email protected]> Committed: Thu Feb 8 10:55:54 2018 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/util/RunJar.java | 2 +- .../main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java | 4 ++-- .../apache/hadoop/hdfs/server/namenode/ReencryptionHandler.java | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/996796f1/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java index 0ae9e47..9dd770c 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java @@ -38,12 +38,12 @@ import java.util.jar.JarInputStream; import java.util.jar.Manifest; import java.util.regex.Pattern; -import com.google.common.io.NullOutputStream; import org.apache.commons.io.input.TeeInputStream; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.io.IOUtils; +import org.apache.hadoop.io.IOUtils.NullOutputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/hadoop/blob/996796f1/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java index dfc6872..b6b42544 100644 --- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java +++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java @@ -18,7 +18,6 @@ package org.apache.hadoop.crypto.key.kms.server; import com.google.common.base.Preconditions; -import com.google.common.base.Stopwatch; import org.apache.hadoop.util.KMSUtil; import org.apache.commons.codec.binary.Base64; import org.apache.hadoop.classification.InterfaceAudience; @@ -32,6 +31,7 @@ import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.crypto.key.kms.KMSClientProvider; import org.apache.hadoop.security.token.delegation.web.HttpUserGroupInformation; +import org.apache.hadoop.util.StopWatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -555,7 +555,7 @@ public class KMS { throws Exception { LOG.trace("Entering reencryptEncryptedKeys method."); try { - final Stopwatch sw = new Stopwatch().start(); + final StopWatch sw = new StopWatch().start(); checkNotEmpty(name, "name"); checkNotNull(jsonPayload, "jsonPayload"); final UserGroupInformation user = HttpUserGroupInformation.get(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/996796f1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ReencryptionHandler.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ReencryptionHandler.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ReencryptionHandler.java index 01c2038..65de397 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ReencryptionHandler.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ReencryptionHandler.java @@ -19,7 +19,6 @@ package org.apache.hadoop.hdfs.server.namenode; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import com.google.common.base.Stopwatch; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; @@ -672,7 +671,7 @@ public class ReencryptionHandler implements Runnable { if (batch.isEmpty()) { return new ReencryptionTask(zoneNodeId, 0, batch); } - final Stopwatch kmsSW = new Stopwatch().start(); + final StopWatch kmsSW = new StopWatch().start(); int numFailures = 0; String result = "Completed"; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
