YARN-5813. Slider should not try to set a negative lifetime timeout value. Contributed by Jian He
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eb8bd398 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eb8bd398 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eb8bd398 Branch: refs/heads/yarn-native-services Commit: eb8bd39846c72a991940bdb5dd2e88dd690948e9 Parents: 4a3f1a4 Author: Gour Saha <gourks...@apache.org> Authored: Tue Nov 1 17:39:54 2016 -0700 Committer: Jian He <jia...@apache.org> Committed: Tue Dec 13 14:46:44 2016 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/slider/client/SliderClient.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb8bd398/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java index d1f88c5..ea10ed0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -2120,7 +2120,9 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe amLauncher.setKeepContainersOverRestarts(true); // set lifetime in submission context; Map<ApplicationTimeoutType, Long> appTimeout = new HashMap<>(); - appTimeout.put(ApplicationTimeoutType.LIFETIME, lifetime); + if (lifetime >= 0) { + appTimeout.put(ApplicationTimeoutType.LIFETIME, lifetime); + } amLauncher.submissionContext.setApplicationTimeouts(appTimeout); int maxAppAttempts = config.getInt(KEY_AM_RESTART_LIMIT, 0); amLauncher.setMaxAppAttempts(maxAppAttempts); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
