Repository: hadoop Updated Branches: refs/heads/trunk 1f6652443 -> 84ddedc0b
HADOOP-10101. Update guava dependency to the latest version. (ozawa) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/84ddedc0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/84ddedc0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/84ddedc0 Branch: refs/heads/trunk Commit: 84ddedc0b2d58257d45c16ee5e83b15f94a7ba3a Parents: 1f66524 Author: Tsuyoshi Ozawa <oz...@apache.org> Authored: Sat Mar 25 10:06:52 2017 +0900 Committer: Tsuyoshi Ozawa <oz...@apache.org> Committed: Sat Mar 25 10:06:52 2017 +0900 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/fs/shell/XAttrCommands.java | 2 +- .../main/java/org/apache/hadoop/ha/ZKFailoverController.java | 3 +-- .../main/java/org/apache/hadoop/metrics2/AbstractMetric.java | 3 ++- .../src/main/java/org/apache/hadoop/metrics2/MetricsTag.java | 3 ++- .../org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java | 3 ++- .../src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java | 4 ++-- .../java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java | 3 ++- .../java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java | 4 ++-- .../java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java | 6 +++--- .../java/org/apache/hadoop/metrics2/util/MetricsCache.java | 4 ++-- .../main/java/org/apache/hadoop/util/curator/ChildReaper.java | 4 ++-- .../org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java | 4 ++-- .../org/apache/hadoop/hdfs/server/datanode/DataStorage.java | 2 +- .../apache/hadoop/hdfs/server/namenode/AclTransformation.java | 4 ++-- .../org/apache/hadoop/hdfs/server/namenode/JournalSet.java | 2 +- .../apache/hadoop/hdfs/qjournal/client/TestQJMWithFaults.java | 2 +- .../hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java | 2 +- hadoop-project/pom.xml | 2 +- .../records/impl/pb/ApplicationSubmissionContextPBImpl.java | 2 +- .../src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java | 4 ++-- .../hadoop/yarn/server/resourcemanager/RMAppManager.java | 6 +++--- .../scheduler/fair/AllocationFileLoaderService.java | 2 +- .../server/resourcemanager/scheduler/fair/QueueManager.java | 2 +- 23 files changed, 38 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java index d55c80b..4505aa9 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java @@ -67,7 +67,7 @@ class XAttrCommands extends FsCommand { "0x and 0s, respectively.\n" + "<path>: The file or directory.\n"; private final static Function<String, XAttrCodec> enValueOfFunc = - Enums.valueOfFunction(XAttrCodec.class); + Enums.stringConverter(XAttrCodec.class); private String name = null; private boolean dump = false; http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java index 0ed9158..055bcaa 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java @@ -55,7 +55,6 @@ import org.apache.zookeeper.data.ACL; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import com.google.common.base.Throwables; import com.google.common.util.concurrent.ThreadFactoryBuilder; @InterfaceAudience.LimitedPrivate("HDFS") @@ -511,7 +510,7 @@ public abstract class ZKFailoverController { doFence(target); } catch (Throwable t) { recordActiveAttempt(new ActiveAttemptRecord(false, "Unable to fence old active: " + StringUtils.stringifyException(t))); - Throwables.propagate(t); + throw t; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java index 6a11b87..0605156 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java @@ -18,6 +18,7 @@ package org.apache.hadoop.metrics2; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import static com.google.common.base.Preconditions.*; @@ -84,7 +85,7 @@ public abstract class AbstractMetric implements MetricsInfo { } @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("info", info) .add("value", value()) .toString(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java index e9e50a4..68b0737 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java @@ -18,6 +18,7 @@ package org.apache.hadoop.metrics2; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import static com.google.common.base.Preconditions.*; @@ -80,7 +81,7 @@ public class MetricsTag implements MetricsInfo { } @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("info", info) .add("value", value()) .toString(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java index 3684c7e..fec29c2 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java @@ -18,6 +18,7 @@ package org.apache.hadoop.metrics2.impl; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Iterables; @@ -43,7 +44,7 @@ abstract class AbstractMetricsRecord implements MetricsRecord { } @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("timestamp", timestamp()) .add("name", name()) .add("description", description()) http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java index 782f755..5de7edc 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java @@ -18,7 +18,7 @@ package org.apache.hadoop.metrics2.impl; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.metrics2.MetricsInfo; @@ -48,7 +48,7 @@ public enum MsInfo implements MetricsInfo { } @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name()).add("description", desc) .toString(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java index dfb6c35..054f211 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java @@ -18,6 +18,7 @@ package org.apache.hadoop.metrics2.lib; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import static com.google.common.base.Preconditions.*; import org.apache.hadoop.metrics2.MetricsInfo; @@ -55,7 +56,7 @@ class MetricsInfoImpl implements MetricsInfo { } @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name).add("description", description) .toString(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java index 1ef74f4..0af45a6 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.Map; import com.google.common.collect.Maps; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; @@ -416,7 +416,7 @@ public class MetricsRegistry { } @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("info", metricsInfo).add("tags", tags()).add("metrics", metrics()) .toString(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java index 55bb417..59a79fd 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java @@ -18,11 +18,11 @@ package org.apache.hadoop.metrics2.source; -import com.google.common.base.Objects; - import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.metrics2.MetricsInfo; +import com.google.common.base.MoreObjects; + /** * JVM and logging related metrics info instances */ @@ -60,7 +60,7 @@ public enum JvmMetricsInfo implements MetricsInfo { @Override public String description() { return desc; } @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name()).add("description", desc) .toString(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java index efcb286..753e307 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java @@ -31,7 +31,7 @@ import org.apache.hadoop.metrics2.AbstractMetric; import org.apache.hadoop.metrics2.MetricsRecord; import org.apache.hadoop.metrics2.MetricsTag; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.Maps; /** @@ -127,7 +127,7 @@ public class MetricsCache { } @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("tags", tags).add("metrics", metrics) .toString(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ChildReaper.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ChildReaper.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ChildReaper.java index 3bff187..86142fb 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ChildReaper.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ChildReaper.java @@ -19,7 +19,6 @@ package org.apache.hadoop.util.curator; import com.google.common.base.Preconditions; -import com.google.common.collect.Sets; import org.apache.curator.framework.recipes.locks.Reaper; import org.apache.curator.utils.CloseableUtils; import org.apache.curator.framework.CuratorFramework; @@ -34,6 +33,7 @@ import org.slf4j.LoggerFactory; import java.io.Closeable; import java.io.IOException; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -82,7 +82,7 @@ public class ChildReaper implements Closeable * @since 15.0 */ public static <E> Set<E> newConcurrentHashSet() { - return Sets.newSetFromMap(new ConcurrentHashMap<E, Boolean>()); + return Collections.newSetFromMap(new ConcurrentHashMap<E, Boolean>()); } private enum State http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java index 45bea5e..bcdc1c8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hdfs; -import com.google.common.collect.Iterators; +import java.util.Collections; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hdfs.inotify.EventBatch; @@ -72,7 +72,7 @@ public class DFSInotifyEventInputStream { DFSInotifyEventInputStream(ClientProtocol namenode, Tracer tracer, long lastReadTxid) { this.namenode = namenode; - this.it = Iterators.emptyIterator(); + this.it = Collections.emptyIterator(); this.lastReadTxid = lastReadTxid; this.tracer = tracer; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java index a5324be..57ef1bc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java @@ -1109,7 +1109,7 @@ public class DataStorage extends Storage { } linkWorkers.shutdown(); for (Future<Void> f : futures) { - Futures.get(f, IOException.class); + Futures.getChecked(f, IOException.class); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclTransformation.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclTransformation.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclTransformation.java index c887e9d..3e4a319 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclTransformation.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclTransformation.java @@ -28,7 +28,7 @@ import java.util.EnumSet; import java.util.Iterator; import java.util.List; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ComparisonChain; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -366,7 +366,7 @@ final class AclTransformation { for (AclEntry entry: aclBuilder) { scopeFound.add(entry.getScope()); if (entry.getType() == GROUP || entry.getName() != null) { - FsAction scopeUnionPerms = Objects.firstNonNull( + FsAction scopeUnionPerms = MoreObjects.firstNonNull( unionPerms.get(entry.getScope()), FsAction.NONE); unionPerms.put(entry.getScope(), scopeUnionPerms.or(entry.getPermission())); http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/JournalSet.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/JournalSet.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/JournalSet.java index fde54a8..db77d31 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/JournalSet.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/JournalSet.java @@ -63,7 +63,7 @@ public class JournalSet implements JournalManager { public int compare(EditLogInputStream elis1, EditLogInputStream elis2) { // we want local logs to be ordered earlier in the collection, and true // is considered larger than false, so we want to invert the booleans here - return ComparisonChain.start().compare(!elis1.isLocalLog(), + return ComparisonChain.start().compareFalseFirst(!elis1.isLocalLog(), !elis2.isLocalLog()).result(); } }; http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQJMWithFaults.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQJMWithFaults.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQJMWithFaults.java index ecdbaf5..c752f23 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQJMWithFaults.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQJMWithFaults.java @@ -402,7 +402,7 @@ public class TestQJMWithFaults { @Override protected ExecutorService createSingleThreadExecutor() { - return MoreExecutors.sameThreadExecutor(); + return MoreExecutors.newDirectExecutorService(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java index 7d770e0..9aada1d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java @@ -946,7 +946,7 @@ public class TestQuorumJournalManager { protected ExecutorService createSingleThreadExecutor() { // Don't parallelize calls to the quorum in the tests. // This makes the tests more deterministic. - return MoreExecutors.sameThreadExecutor(); + return MoreExecutors.newDirectExecutorService(); } }; http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 8de7703..68e8b5c 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -514,7 +514,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>11.0.2</version> + <version>21.0</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java index 62b54e7..66930e7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java @@ -283,7 +283,7 @@ extends ApplicationSubmissionContext { "maximum allowed length of a tag is " + YarnConfiguration.APPLICATION_MAX_TAG_LENGTH); } - if (!CharMatcher.ASCII.matchesAllOf(tag)) { + if (!CharMatcher.ascii().matchesAllOf(tag)) { throw new IllegalArgumentException("A tag can only have ASCII " + "characters! Invalid tag - " + tag); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java index de6a52b..300bf3e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java @@ -275,7 +275,7 @@ public abstract class WebApp extends ServletModule { static String getPrefix(String pathSpec) { int start = 0; - while (CharMatcher.WHITESPACE.matches(pathSpec.charAt(start))) { + while (CharMatcher.whitespace().matches(pathSpec.charAt(start))) { ++start; } if (pathSpec.charAt(start) != '/') { @@ -291,7 +291,7 @@ public abstract class WebApp extends ServletModule { char c; do { c = pathSpec.charAt(--ci); - } while (c == '/' || CharMatcher.WHITESPACE.matches(c)); + } while (c == '/' || CharMatcher.whitespace().matches(c)); return pathSpec.substring(start, ci + 1); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java index e211867..1f446e6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java @@ -590,7 +590,7 @@ public class RMAppManager implements EventHandler<RMAppManagerEvent>, this.rmContext.getStateStore() .updateApplicationStateSynchronously(appState, false, future); - Futures.get(future, YarnException.class); + Futures.getChecked(future, YarnException.class); // update in-memory ((RMAppImpl) app).updateApplicationTimeout(newExpireTime); @@ -627,7 +627,7 @@ public class RMAppManager implements EventHandler<RMAppManagerEvent>, return; } - Futures.get(future, YarnException.class); + Futures.getChecked(future, YarnException.class); // update in-memory ((RMAppImpl) app).setApplicationPriority(appPriority); @@ -710,7 +710,7 @@ public class RMAppManager implements EventHandler<RMAppManagerEvent>, false, future); try { - Futures.get(future, YarnException.class); + Futures.getChecked(future, YarnException.class); } catch (YarnException ex) { if (!toSuppressException) { throw ex; http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java index 163a265..d29d34e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java @@ -465,7 +465,7 @@ public class AllocationFileLoaderService extends AbstractService { Set<String> reservableQueues, Set<String> nonPreemptableQueues) throws AllocationConfigurationException { - String queueName = CharMatcher.WHITESPACE.trimFrom( + String queueName = CharMatcher.whitespace().trimFrom( element.getAttribute("name")); if (queueName.contains(".")) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java index 3c601fa..5b006df 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java @@ -535,6 +535,6 @@ public class QueueManager { // use the same white space trim as in QueueMetrics() otherwise things fail // guava uses a different definition for whitespace than java. return !node.isEmpty() && - node.equals(CharMatcher.WHITESPACE.trimFrom(node)); + node.equals(CharMatcher.whitespace().trimFrom(node)); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
