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 2189F200CD0 for ; Tue, 25 Jul 2017 20:02:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1FF011659E0; Tue, 25 Jul 2017 18:02:45 +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 6CD281658F3 for ; Tue, 25 Jul 2017 20:02:44 +0200 (CEST) Received: (qmail 50152 invoked by uid 500); 25 Jul 2017 18:02:43 -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 50143 invoked by uid 99); 25 Jul 2017 18:02:43 -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; Tue, 25 Jul 2017 18:02:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 70FF1DFC28; Tue, 25 Jul 2017 18:02:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jianhe@apache.org To: common-commits@hadoop.apache.org Date: Tue, 25 Jul 2017 18:02:43 -0000 Message-Id: <672a888d91d44596bc69aa19fccf9275@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/50] [abbrv] hadoop git commit: YARN-6205. Default lifetime for native services app is invalid. Contributed by Billie Rinaldi [Forced Update!] archived-at: Tue, 25 Jul 2017 18:02:45 -0000 Repository: hadoop Updated Branches: refs/heads/yarn-native-services e79f4f5a9 -> cc1dd1e5f (forced update) YARN-6205. Default lifetime for native services app is invalid. Contributed by Billie Rinaldi Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c6142f2a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c6142f2a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c6142f2a Branch: refs/heads/yarn-native-services Commit: c6142f2aae8e42abd8272d2c0d4c9aecac0189dc Parents: 0f6652d Author: Gour Saha Authored: Tue Feb 21 09:04:04 2017 -0800 Committer: Jian He Committed: Tue Jul 25 10:49:24 2017 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/slider/client/SliderClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6142f2a/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 e84809a..00e2b62 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 @@ -2070,7 +2070,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe amLauncher.setKeepContainersOverRestarts(true); // set lifetime in submission context; Map appTimeout = new HashMap<>(); - if (lifetime >= 0) { + if (lifetime > 0) { appTimeout.put(ApplicationTimeoutType.LIFETIME, lifetime); } amLauncher.submissionContext.setApplicationTimeouts(appTimeout); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org