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 D9934200D1B for ; Thu, 12 Oct 2017 13:50:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D8344160BE9; Thu, 12 Oct 2017 11:50:47 +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 290BF160BE5 for ; Thu, 12 Oct 2017 13:50:47 +0200 (CEST) Received: (qmail 20565 invoked by uid 500); 12 Oct 2017 11:50:42 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 20183 invoked by uid 99); 12 Oct 2017 11:50:41 -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; Thu, 12 Oct 2017 11:50:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C954FDFBAB; Thu, 12 Oct 2017 11:50:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ab@apache.org To: commits@lucene.apache.org Date: Thu, 12 Oct 2017 11:50:50 -0000 Message-Id: <2eafe886d8bc4f49b32b25dc458fcee2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/50] [abbrv] lucene-solr:jira/solr-11285: SOLR-11440: Potential fix for better handling of exceptions thrown during closing. archived-at: Thu, 12 Oct 2017 11:50:48 -0000 SOLR-11440: Potential fix for better handling of exceptions thrown during closing. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/77fc1885 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/77fc1885 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/77fc1885 Branch: refs/heads/jira/solr-11285 Commit: 77fc1885c7a35740fdc5f591ecd54e75702f1612 Parents: 6b327fa Author: Andrzej Bialecki Authored: Thu Oct 5 10:45:28 2017 +0200 Committer: Andrzej Bialecki Committed: Thu Oct 5 10:45:28 2017 +0200 ---------------------------------------------------------------------- .../solr/cloud/autoscaling/ScheduledTriggers.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/77fc1885/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java index 7bbbcd9..9dcec35 100644 --- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java +++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java @@ -37,7 +37,6 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; @@ -147,18 +146,22 @@ public class ScheduledTriggers implements Closeable { if (isClosed) { throw new AlreadyClosedException("ScheduledTriggers has been closed and cannot be used anymore"); } - ScheduledTrigger st = null; + ScheduledTrigger st; try { st = new ScheduledTrigger(newTrigger, zkClient, queueStats); } catch (Exception e) { - //TODO to decide what to do - log.error("Failed to add trigger", e); + if (isClosed) { + throw new AlreadyClosedException("ScheduledTriggers has been closed and cannot be used anymore"); + } + if (!zkClient.isConnected() || zkClient.isClosed()) { + log.error("Failed to add trigger " + newTrigger.getName() + " - closing or disconnected from ZK", e); + } else { + log.error("Failed to add trigger " + newTrigger.getName(), e); + } return; } - ScheduledTrigger scheduledTrigger = st; - ScheduledTrigger old = scheduledTriggers.putIfAbsent(newTrigger.getName(), scheduledTrigger); if (old != null) { if (old.trigger.equals(newTrigger)) {