Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java (revision e45407128d4e9a9804c777c8f845ad41e1280177) +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java (revision 796a925e989a81ce3766940089b1e8665cd4b149) @@ -2785,6 +2785,13 @@ public static final long DEFAULT_NM_PROCESS_KILL_WAIT_MS = 5000; + /** + * Extra duration to wait for applications to be killed on shutdown. + */ + public static final String SHUTDOWN_CLEANUP_SLOP_MS = + NM_PREFIX + "shutdown-cleanup-slop.ms"; + public static final long DEFAULT_SHUTDOWN_CLEANUP_SLOP_MS = 1000; + /** Max time to wait to establish a connection to RM */ public static final String RESOURCEMANAGER_CONNECT_MAX_WAIT_MS = RM_PREFIX + "connect.max-wait.ms"; Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml (revision e45407128d4e9a9804c777c8f845ad41e1280177) +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml (revision 796a925e989a81ce3766940089b1e8665cd4b149) @@ -2244,6 +2244,13 @@ 5000 + + Extra duration to wait for applications to be killed on shutdown + yarn.nodemanager.shutdown-cleanup-slop.ms + 1000 + + + The minimum allowed version of a resourcemanager that a nodemanager will connect to. The valid values are NONE (no version checking), EqualToNM (the resourcemanager's version is Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.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-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java (revision e45407128d4e9a9804c777c8f845ad41e1280177) +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java (revision 796a925e989a81ce3766940089b1e8665cd4b149) @@ -194,10 +194,6 @@ private enum ReInitOp { RE_INIT, COMMIT, ROLLBACK, LOCALIZE; } - /** - * Extra duration to wait for applications to be killed on shutdown. - */ - private static final int SHUTDOWN_CLEANUP_SLOP_MS = 1000; private static final Logger LOG = LoggerFactory.getLogger(ContainerManagerImpl.class); @@ -322,7 +318,8 @@ YarnConfiguration.DEFAULT_NM_SLEEP_DELAY_BEFORE_SIGKILL_MS) + conf.getLong(YarnConfiguration.NM_PROCESS_KILL_WAIT_MS, YarnConfiguration.DEFAULT_NM_PROCESS_KILL_WAIT_MS) + - SHUTDOWN_CLEANUP_SLOP_MS; + conf.getLong(YarnConfiguration.SHUTDOWN_CLEANUP_SLOP_MS, + YarnConfiguration.DEFAULT_SHUTDOWN_CLEANUP_SLOP_MS); super.serviceInit(conf); recover();