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 926A7200AE4 for ; Fri, 10 Jun 2016 00:41:08 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 912BF160A59; Thu, 9 Jun 2016 22:41:08 +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 AA862160A5C for ; Fri, 10 Jun 2016 00:41:07 +0200 (CEST) Received: (qmail 88530 invoked by uid 500); 9 Jun 2016 22:41:06 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 88312 invoked by uid 99); 9 Jun 2016 22:41: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; Thu, 09 Jun 2016 22:41:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 70C42DFFF8; Thu, 9 Jun 2016 22:41:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Thu, 09 Jun 2016 22:41:08 -0000 Message-Id: In-Reply-To: <87937756bebb413c8b9b956343d24e98@git.apache.org> References: <87937756bebb413c8b9b956343d24e98@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/10] accumulo git commit: ACCUMULO-4335 Error conditions that result in a Halt should ensure non-zero exit code. archived-at: Thu, 09 Jun 2016 22:41:08 -0000 ACCUMULO-4335 Error conditions that result in a Halt should ensure non-zero exit code. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f99ac9b3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f99ac9b3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f99ac9b3 Branch: refs/heads/1.8 Commit: f99ac9b31cb2194d7b6fa2debc7e018a4410afe7 Parents: 60ac92d Author: Sean Busbey Authored: Wed Jun 8 10:56:44 2016 -0500 Committer: Josh Elser Committed: Thu Jun 9 18:39:00 2016 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/util/TServerUtils.java | 2 +- .../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +- .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f99ac9b3/server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java index d932b2a..a84cf15 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java @@ -299,7 +299,7 @@ public class TServerUtils { try { finalServer.serve(); } catch (Error e) { - Halt.halt("Unexpected error in TThreadPoolServer " + e + ", halting."); + Halt.halt("Unexpected error in TThreadPoolServer " + e + ", halting.", 1); } } }; http://git-wip-us.apache.org/repos/asf/accumulo/blob/f99ac9b3/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index b98daf7..6d50e94 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -678,7 +678,7 @@ public class SimpleGarbageCollector implements Iface { LockWatcher lockWatcher = new LockWatcher() { @Override public void lostLock(LockLossReason reason) { - Halt.halt("GC lock in zookeeper lost (reason = " + reason + "), exiting!"); + Halt.halt("GC lock in zookeeper lost (reason = " + reason + "), exiting!", 1); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/f99ac9b3/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index 955c365..8155ea6 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -3212,7 +3212,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu @Override public void lostLock(final LockLossReason reason) { - Halt.halt(0, new Runnable() { + Halt.halt(serverStopRequested ? 0 : 1, new Runnable() { @Override public void run() { if (!serverStopRequested) @@ -3224,7 +3224,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu @Override public void unableToMonitorLockNode(final Throwable e) { - Halt.halt(0, new Runnable() { + Halt.halt(1, new Runnable() { @Override public void run() { log.fatal("Lost ability to monitor tablet server lock, exiting.", e);