Index: src/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java (revision 16aa93a4766bafe66424bf382cc0ba06b405144f) +++ src/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java (date 1671071231906) @@ -956,7 +956,8 @@ applicationAttemptMap.remove(application.getApplicationAttemptId()); user.finishApplication(wasActive); - if (user.getTotalApplications() == 0) { + if (user.getTotalApplications() == 0 && + Resources.lessThanOrEqual(resourceCalculator, lastClusterResource, user.getAllUsed(), Resources.none())) { usersManager.removeUser(application.getUser()); }