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 D4BC2200B6B for ; Fri, 9 Sep 2016 19:58:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D36D1160ACA; Fri, 9 Sep 2016 17:58:11 +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 25A71160AC2 for ; Fri, 9 Sep 2016 19:58:10 +0200 (CEST) Received: (qmail 82598 invoked by uid 500); 9 Sep 2016 17:58:07 -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 80363 invoked by uid 99); 9 Sep 2016 17:58:06 -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; Fri, 09 Sep 2016 17:58:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 29B59E01BD; Fri, 9 Sep 2016 17:58:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wangda@apache.org To: common-commits@hadoop.apache.org Date: Fri, 09 Sep 2016 17:58:14 -0000 Message-Id: <0df01007e0b6416fa61de8fe2e8268d4@git.apache.org> In-Reply-To: <91d51375330b4d83af5ded075a48c1c8@git.apache.org> References: <91d51375330b4d83af5ded075a48c1c8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/44] hadoop git commit: HDFS-9849. DiskBalancer: reduce lock path in shutdown code. Contributed by Yuanbo Liu. archived-at: Fri, 09 Sep 2016 17:58:12 -0000 HDFS-9849. DiskBalancer: reduce lock path in shutdown code. Contributed by Yuanbo Liu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/baab4892 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/baab4892 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/baab4892 Branch: refs/heads/YARN-3368 Commit: baab48922a301d639ea84ecf00d8a7616acd950d Parents: 35c5943 Author: Anu Engineer Authored: Thu Sep 8 20:00:42 2016 -0700 Committer: Anu Engineer Committed: Thu Sep 8 20:00:42 2016 -0700 ---------------------------------------------------------------------- .../hdfs/server/datanode/DiskBalancer.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/baab4892/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java index ec72d97..e9e2e5b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java @@ -121,17 +121,23 @@ public class DiskBalancer { */ public void shutdown() { lock.lock(); + boolean needShutdown = false; try { this.isDiskBalancerEnabled = false; this.currentResult = Result.NO_PLAN; if ((this.future != null) && (!this.future.isDone())) { this.currentResult = Result.PLAN_CANCELLED; this.blockMover.setExitFlag(); - shutdownExecutor(); + scheduler.shutdown(); + needShutdown = true; } } finally { lock.unlock(); } + // no need to hold lock while shutting down executor. + if (needShutdown) { + shutdownExecutor(); + } } /** @@ -139,7 +145,6 @@ public class DiskBalancer { */ private void shutdownExecutor() { final int secondsTowait = 10; - scheduler.shutdown(); try { if (!scheduler.awaitTermination(secondsTowait, TimeUnit.SECONDS)) { scheduler.shutdownNow(); @@ -228,6 +233,7 @@ public class DiskBalancer { */ public void cancelPlan(String planID) throws DiskBalancerException { lock.lock(); + boolean needShutdown = false; try { checkDiskBalancerEnabled(); if (this.planID == null || @@ -239,13 +245,18 @@ public class DiskBalancer { DiskBalancerException.Result.NO_SUCH_PLAN); } if (!this.future.isDone()) { - this.blockMover.setExitFlag(); - shutdownExecutor(); this.currentResult = Result.PLAN_CANCELLED; + this.blockMover.setExitFlag(); + scheduler.shutdown(); + needShutdown = true; } } finally { lock.unlock(); } + // no need to hold lock while shutting down executor. + if (needShutdown) { + shutdownExecutor(); + } } /** --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org