Index: 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 IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- 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 (revision ef74a5661b7174e42c0c2eb535c6945946c18453) +++ 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 (revision ) @@ -180,8 +180,12 @@ void addContainersForPreemption(Collection containers, FSAppAttempt app) { - appIdToAppMap.putIfAbsent(app.getApplicationAttemptId(), app); - resourcesPreemptedForApp.putIfAbsent(app, Resource.newInstance(0, 0)); + if (!appIdToAppMap.containsKey(app.getApplicationAttemptId())) { + appIdToAppMap.put(app.getApplicationAttemptId(), app); + } + if (!resourcesPreemptedForApp.containsKey(app)) { + resourcesPreemptedForApp.put(app, Resource.newInstance(0, 0)); + } Resource appReserved = resourcesPreemptedForApp.get(app); for(RMContainer container : containers) {