diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java index af83102c96dd15248cfdc46617e7d74c45446b80..d29f67413175554881b39b00d3f3487fb3ff3f8e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java @@ -128,12 +128,12 @@ public RMAdminCLI(Configuration conf) { } private static void appendHAUsage(final StringBuilder usageBuilder) { - for (String cmdKey : USAGE.keySet()) { - if (cmdKey.equals("-help")) { + for (Map.Entry cmdEntry : USAGE.entrySet()) { + if (cmdEntry.getKey().equals("-help")) { continue; } - UsageInfo usageInfo = USAGE.get(cmdKey); - usageBuilder.append(" [" + cmdKey + " " + usageInfo.args + "]"); + UsageInfo usageInfo = cmdEntry.getValue(); + usageBuilder.append(" [" + cmdEntry.getKey() + " " + usageInfo.args + "]"); } } @@ -173,14 +173,15 @@ private static void buildIndividualUsageMsg(String cmd, private static void buildUsageMsg(StringBuilder builder, boolean isHAEnabled) { builder.append("Usage: yarn rmadmin\n"); - for (String cmdKey : ADMIN_USAGE.keySet()) { - UsageInfo usageInfo = ADMIN_USAGE.get(cmdKey); - builder.append(" " + cmdKey + " " + usageInfo.args + "\n"); + for (Map.Entry cmdEntry : ADMIN_USAGE.entrySet()) { + UsageInfo usageInfo = cmdEntry.getValue(); + builder.append(" " + cmdEntry.getKey() + " " + usageInfo.args + "\n"); } if (isHAEnabled) { - for (String cmdKey : USAGE.keySet()) { + for (Map.Entry cmdEntry : USAGE.entrySet()) { + String cmdKey = cmdEntry.getKey(); if (!cmdKey.equals("-help")) { - UsageInfo usageInfo = USAGE.get(cmdKey); + UsageInfo usageInfo = cmdEntry.getValue(); builder.append(" " + cmdKey + " " + usageInfo.args + "\n"); } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java index 25ff417320090c5c88eb4701202fee417793e3bd..cb6f1f39148eec180a78a3a86080ac64632fb997 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java @@ -383,8 +383,8 @@ protected void checkRemoveFromClusterNodeLabels( @SuppressWarnings("unchecked") protected void internalRemoveFromClusterNodeLabels(Collection labelsToRemove) { // remove labels from nodes - for (String nodeName : nodeCollections.keySet()) { - Host host = nodeCollections.get(nodeName); + for (Map.Entry nodeEntry : nodeCollections.entrySet()) { + Host host = nodeEntry.getValue(); if (null != host) { host.labels.removeAll(labelsToRemove); for (Node nm : host.nms.values()) {