From common-commits-return-89784-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Tue Oct 23 10:52:30 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1441218066B for ; Tue, 23 Oct 2018 10:52:29 +0200 (CEST) Received: (qmail 14087 invoked by uid 500); 23 Oct 2018 08:52:29 -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 14078 invoked by uid 99); 23 Oct 2018 08:52:28 -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, 23 Oct 2018 08:52:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C533BDFAB3; Tue, 23 Oct 2018 08:52:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rohithsharmaks@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-8826. Fix lingering timeline collector after serviceStop in TimelineCollectorManager. Contributed by Prabha Manepalli. Date: Tue, 23 Oct 2018 08:52:28 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 56a27284a -> dbf36dbb8 YARN-8826. Fix lingering timeline collector after serviceStop in TimelineCollectorManager. Contributed by Prabha Manepalli. (cherry picked from commit 0b62983c5a9361eb832784f134f140f9926c9ec6) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dbf36dbb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dbf36dbb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dbf36dbb Branch: refs/heads/branch-2 Commit: dbf36dbb8dca8c953aaf26e3bbfb5ec5ce3358ea Parents: 56a2728 Author: Rohith Sharma K S Authored: Tue Oct 23 12:58:41 2018 +0530 Committer: Rohith Sharma K S Committed: Tue Oct 23 14:10:24 2018 +0530 ---------------------------------------------------------------------- .../server/timelineservice/collector/TimelineCollectorManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dbf36dbb/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorManager.java index c64a3ad..9727850 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorManager.java @@ -221,7 +221,7 @@ public class TimelineCollectorManager extends CompositeService { @Override protected void serviceStop() throws Exception { - if (collectors != null && collectors.size() > 1) { + if (collectors != null && collectors.size() > 0) { synchronized (collectors) { for (TimelineCollector c : collectors.values()) { c.serviceStop(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org