Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7129F200C77 for ; Mon, 1 May 2017 16:46:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6F990160BAE; Mon, 1 May 2017 14:46:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 426D6160BAB for ; Mon, 1 May 2017 16:46:11 +0200 (CEST) Received: (qmail 34952 invoked by uid 500); 1 May 2017 14:46:10 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 34943 invoked by uid 99); 1 May 2017 14:46:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 May 2017 14:46:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EFF4BDFBC7; Mon, 1 May 2017 14:46:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: naganarasimha_gr@apache.org To: common-commits@hadoop.apache.org Message-Id: <7c30edb6c23f45959a71e8651cff9951@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-6519. Fix warnings from Spotbugs in hadoop-yarn-server-resourcemanager. Contributed by Weiwei Yang. Date: Mon, 1 May 2017 14:46:09 +0000 (UTC) archived-at: Mon, 01 May 2017 14:46:12 -0000 Repository: hadoop Updated Branches: refs/heads/trunk 64f68cb0b -> 30fc58019 YARN-6519. Fix warnings from Spotbugs in hadoop-yarn-server-resourcemanager. Contributed by Weiwei Yang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/30fc5801 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/30fc5801 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/30fc5801 Branch: refs/heads/trunk Commit: 30fc5801966feb7f9bdd7d79db75acc595102913 Parents: 64f68cb Author: Naganarasimha Authored: Mon May 1 20:15:27 2017 +0530 Committer: Naganarasimha Committed: Mon May 1 20:15:27 2017 +0530 ---------------------------------------------------------------------- .../ApplicationMasterService.java | 2 +- .../ProportionalCapacityPreemptionPolicy.java | 17 ++++++---------- .../rmapp/attempt/RMAppAttemptImpl.java | 6 ++++-- .../rmapp/attempt/RMAppAttemptMetrics.java | 2 +- .../scheduler/AbstractYarnScheduler.java | 2 +- .../resourcemanager/scheduler/NodeType.java | 12 +++++++++-- .../resourcemanager/scheduler/QueueMetrics.java | 21 ++++++++++++++------ .../scheduler/capacity/CSQueueMetrics.java | 4 ++-- .../capacity/CapacitySchedulerQueueManager.java | 6 ++++-- .../scheduler/fair/FSQueueMetrics.java | 4 ++-- .../scheduler/fair/FSSchedulerNode.java | 8 ++++---- 11 files changed, 50 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/30fc5801/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.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/ApplicationMasterService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java index 70a46a1..55b8fbb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java @@ -393,7 +393,7 @@ public class ApplicationMasterService extends AbstractService implements return hasApplicationMasterRegistered; } - protected final static List EMPTY_CONTAINER_LIST = + private final static List EMPTY_CONTAINER_LIST = new ArrayList(); protected static final Allocation EMPTY_ALLOCATION = new Allocation( EMPTY_CONTAINER_LIST, Resources.createResource(0), null, null, null); http://git-wip-us.apache.org/repos/asf/hadoop/blob/30fc5801/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.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/monitor/capacity/ProportionalCapacityPreemptionPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java index 3bf6994..dc6f1c2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java @@ -52,7 +52,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -306,16 +305,12 @@ public class ProportionalCapacityPreemptionPolicy private void cleanupStaledPreemptionCandidates(long currentTime) { // Keep the preemptionCandidates list clean - for (Iterator i = preemptionCandidates.keySet().iterator(); - i.hasNext(); ) { - RMContainer id = i.next(); - // garbage collect containers that are irrelevant for preemption - // And avoid preempt selected containers for *this execution* - // or within 1 ms - if (preemptionCandidates.get(id) + 2 * maxWaitTime < currentTime) { - i.remove(); - } - } + // garbage collect containers that are irrelevant for preemption + // And avoid preempt selected containers for *this execution* + // or within 1 ms + preemptionCandidates.entrySet() + .removeIf(candidate -> + candidate.getValue() + 2 * maxWaitTime < currentTime); } private Set getLeafQueueNames(TempQueuePerPartition q) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/30fc5801/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.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/rmapp/attempt/RMAppAttemptImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java index 19503e5..d66a97d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java @@ -1000,9 +1000,11 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable { // if am crashed and not received this response, we should resend // this msg again after am restart if (!this.finishedContainersSentToAM.isEmpty()) { - for (NodeId nodeId : this.finishedContainersSentToAM.keySet()) { + for (Map.Entry> finishedContainer + : this.finishedContainersSentToAM.entrySet()) { List containerStatuses = - this.finishedContainersSentToAM.get(nodeId); + finishedContainer.getValue(); + NodeId nodeId = finishedContainer.getKey(); this.justFinishedContainers.putIfAbsent(nodeId, new ArrayList<>()); this.justFinishedContainers.get(nodeId).addAll(containerStatuses); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/30fc5801/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.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/rmapp/attempt/RMAppAttemptMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java index a642e45..e089050 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java @@ -152,7 +152,7 @@ public class RMAppAttemptMetrics { public void incNumAllocatedContainers(NodeType containerType, NodeType requestType) { - localityStatistics[containerType.index][requestType.index]++; + localityStatistics[containerType.getIndex()][requestType.getIndex()]++; totalAllocatedContainers++; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/30fc5801/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.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/AbstractYarnScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java index b954bdf..c00b7be 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java @@ -132,7 +132,7 @@ public abstract class AbstractYarnScheduler protected int nmExpireInterval; protected long nmHeartbeatInterval; - protected final static List EMPTY_CONTAINER_LIST = + private final static List EMPTY_CONTAINER_LIST = new ArrayList(); protected static final Allocation EMPTY_ALLOCATION = new Allocation( EMPTY_CONTAINER_LIST, Resources.createResource(0), null, null, null); http://git-wip-us.apache.org/repos/asf/hadoop/blob/30fc5801/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/NodeType.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/NodeType.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/NodeType.java index 2b193bb..7bd15f0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/NodeType.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/NodeType.java @@ -23,9 +23,17 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler; */ public enum NodeType { NODE_LOCAL(0), RACK_LOCAL(1), OFF_SWITCH(2); - public int index; - private NodeType(int index) { + private final int index; + + NodeType(int index) { this.index = index; } + + /** + * @return the index of the node type + */ + public int getIndex() { + return index; + } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/30fc5801/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.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/QueueMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java index 007d2b3..9a57876 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java @@ -142,20 +142,29 @@ public class QueueMetrics implements MetricsSource { */ @Private public synchronized static void clearQueueMetrics() { - queueMetrics.clear(); + QUEUE_METRICS.clear(); } - + /** * Simple metrics cache to help prevent re-registrations. */ - protected final static Map queueMetrics = + private static final Map QUEUE_METRICS = new HashMap(); - + + /** + * Returns the metrics cache to help prevent re-registrations. + * + * @return A string to {@link QueueMetrics} map. + */ + protected static Map getQueueMetrics() { + return QUEUE_METRICS; + } + public synchronized static QueueMetrics forQueue(MetricsSystem ms, String queueName, Queue parent, boolean enableUserMetrics, Configuration conf) { - QueueMetrics metrics = queueMetrics.get(queueName); + QueueMetrics metrics = QUEUE_METRICS.get(queueName); if (metrics == null) { metrics = new QueueMetrics(ms, queueName, parent, enableUserMetrics, conf). @@ -168,7 +177,7 @@ public class QueueMetrics implements MetricsSource { sourceName(queueName).toString(), "Metrics for queue: " + queueName, metrics); } - queueMetrics.put(queueName, metrics); + QUEUE_METRICS.put(queueName, metrics); } return metrics; http://git-wip-us.apache.org/repos/asf/hadoop/blob/30fc5801/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueueMetrics.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/capacity/CSQueueMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueueMetrics.java index a601b7b..c4d1934 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueueMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueueMetrics.java @@ -115,7 +115,7 @@ public class CSQueueMetrics extends QueueMetrics { public synchronized static CSQueueMetrics forQueue(String queueName, Queue parent, boolean enableUserMetrics, Configuration conf) { MetricsSystem ms = DefaultMetricsSystem.instance(); - QueueMetrics metrics = queueMetrics.get(queueName); + QueueMetrics metrics = QueueMetrics.getQueueMetrics().get(queueName); if (metrics == null) { metrics = new CSQueueMetrics(ms, queueName, parent, enableUserMetrics, conf) @@ -127,7 +127,7 @@ public class CSQueueMetrics extends QueueMetrics { ms.register(sourceName(queueName).toString(), "Metrics for queue: " + queueName, metrics); } - queueMetrics.put(queueName, metrics); + QueueMetrics.getQueueMetrics().put(queueName, metrics); } return (CSQueueMetrics) metrics; http://git-wip-us.apache.org/repos/asf/hadoop/blob/30fc5801/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.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/capacity/CapacitySchedulerQueueManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java index be6243d..e33fbb3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java @@ -69,9 +69,11 @@ public class CapacitySchedulerQueueManager implements SchedulerQueueManager< new Comparator() { @Override public int compare(CSQueue q1, CSQueue q2) { - if (q1.getUsedCapacity() < q2.getUsedCapacity()) { + int result = Float.compare(q1.getUsedCapacity(), + q2.getUsedCapacity()); + if (result < 0) { return -1; - } else if (q1.getUsedCapacity() > q2.getUsedCapacity()) { + } else if (result > 0) { return 1; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/30fc5801/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueueMetrics.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/FSQueueMetrics.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/FSQueueMetrics.java index 22306a0..4fe3973 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/FSQueueMetrics.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/FSQueueMetrics.java @@ -206,7 +206,7 @@ public class FSQueueMetrics extends QueueMetrics { public synchronized static FSQueueMetrics forQueue(MetricsSystem ms, String queueName, Queue parent, boolean enableUserMetrics, Configuration conf) { - QueueMetrics metrics = queueMetrics.get(queueName); + QueueMetrics metrics = QueueMetrics.getQueueMetrics().get(queueName); if (metrics == null) { metrics = new FSQueueMetrics(ms, queueName, parent, enableUserMetrics, conf) .tag(QUEUE_INFO, queueName); @@ -217,7 +217,7 @@ public class FSQueueMetrics extends QueueMetrics { sourceName(queueName).toString(), "Metrics for queue: " + queueName, metrics); } - queueMetrics.put(queueName, metrics); + QueueMetrics.getQueueMetrics().put(queueName, metrics); } return (FSQueueMetrics)metrics; http://git-wip-us.apache.org/repos/asf/hadoop/blob/30fc5801/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.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/FSSchedulerNode.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/FSSchedulerNode.java index 663e3c8..6575e0c 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/FSSchedulerNode.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/FSSchedulerNode.java @@ -155,10 +155,10 @@ public class FSSchedulerNode extends SchedulerNode { * Remove apps that have their preemption requests fulfilled. */ private synchronized void cleanupPreemptionList() { - Iterator iterator = - resourcesPreemptedForApp.keySet().iterator(); - while (iterator.hasNext()) { - FSAppAttempt app = iterator.next(); + Iterator> iterator = + resourcesPreemptedForApp.entrySet().iterator(); + while(iterator.hasNext()) { + FSAppAttempt app = iterator.next().getKey(); if (app.isStopped() || !app.isStarved()) { // App does not need more resources Resources.subtractFrom(totalResourcesPreempted, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org