From common-commits-return-81284-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Tue Apr 10 21:38:52 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 BC45C18072F for ; Tue, 10 Apr 2018 21:38:51 +0200 (CEST) Received: (qmail 75985 invoked by uid 500); 10 Apr 2018 19:38:41 -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 74374 invoked by uid 99); 10 Apr 2018 19:38:40 -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, 10 Apr 2018 19:38:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8CC73F65B2; Tue, 10 Apr 2018 19:38:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xyao@apache.org To: common-commits@hadoop.apache.org Date: Tue, 10 Apr 2018 19:39:10 -0000 Message-Id: <57aa23f8de9b4240b0172a9fabb4a6c0@git.apache.org> In-Reply-To: <8bdd36ac14a24941a5fa97ab37975427@git.apache.org> References: <8bdd36ac14a24941a5fa97ab37975427@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [32/50] [abbrv] hadoop git commit: HADOOP-15366. Add a helper shutdown routine in HadoopExecutor to ensure clean shutdown. Contributed by Shashikant Banerjee. HADOOP-15366. Add a helper shutdown routine in HadoopExecutor to ensure clean shutdown. Contributed by Shashikant Banerjee. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0b345b76 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0b345b76 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0b345b76 Branch: refs/heads/HDFS-7240 Commit: 0b345b765370515d7222154ad5cae9b86f137a76 Parents: eb47c3d Author: Mukul Kumar Singh Authored: Sat Apr 7 16:29:01 2018 +0530 Committer: Mukul Kumar Singh Committed: Sat Apr 7 16:29:01 2018 +0530 ---------------------------------------------------------------------- .../hadoop/util/concurrent/HadoopExecutors.java | 34 +++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b345b76/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/HadoopExecutors.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/HadoopExecutors.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/HadoopExecutors.java index 1bc6976..7a04c30 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/HadoopExecutors.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/HadoopExecutors.java @@ -27,7 +27,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; - +import org.slf4j.Logger; /** Factory methods for ExecutorService, ScheduledExecutorService instances. * These executor service instances provide additional functionality (e.g @@ -91,6 +91,38 @@ public final class HadoopExecutors { return Executors.newSingleThreadScheduledExecutor(threadFactory); } + /** + * Helper routine to shutdown a executorService. + * + * @param executorService - executorService + * @param logger - Logger + * @param timeout - Timeout + * @param unit - TimeUnits, generally seconds. + */ + public static void shutdown(ExecutorService executorService, Logger logger, + long timeout, TimeUnit unit) { + try { + if (executorService != null) { + executorService.shutdown(); + try { + if (!executorService.awaitTermination(timeout, unit)) { + executorService.shutdownNow(); + } + + if (!executorService.awaitTermination(timeout, unit)) { + logger.error("Unable to shutdown properly."); + } + } catch (InterruptedException e) { + logger.error("Error attempting to shutdown.", e); + executorService.shutdownNow(); + } + } + } catch (Exception e) { + logger.error("Error during shutdown: ", e); + throw e; + } + } + //disable instantiation private HadoopExecutors() { } } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org