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 79C11200B32 for ; Wed, 8 Jun 2016 23:56:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 78A7D160A2E; Wed, 8 Jun 2016 21:56:41 +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 9A609160A35 for ; Wed, 8 Jun 2016 23:56:40 +0200 (CEST) Received: (qmail 31748 invoked by uid 500); 8 Jun 2016 21:56:39 -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 31670 invoked by uid 99); 8 Jun 2016 21:56:39 -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; Wed, 08 Jun 2016 21:56:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 84543E00A7; Wed, 8 Jun 2016 21:56:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@accumulo.apache.org Date: Wed, 08 Jun 2016 21:56:39 -0000 Message-Id: <348adc879caa49c287f9d2df4171aabb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] accumulo git commit: ACCUMULO-4335 Error conditions that result in a Halt should ensure non-zero exit code. archived-at: Wed, 08 Jun 2016 21:56:41 -0000 Repository: accumulo Updated Branches: refs/heads/1.8 ec69f299a -> eff454765 refs/heads/master 3592b38e8 -> 635f54030 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/eff45476 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eff45476 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eff45476 Branch: refs/heads/1.8 Commit: eff45476511f66668e6c144664b07ef962c0ab0c Parents: ec69f29 Author: Sean Busbey Authored: Wed Jun 8 10:56:44 2016 -0500 Committer: Sean Busbey Committed: Wed Jun 8 10:56:44 2016 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/rpc/TServerUtils.java | 2 +- .../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +- .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++-- .../java/org/apache/accumulo/tserver/log/TabletServerLogger.java | 2 +- .../java/org/apache/accumulo/tserver/scan/NextBatchTask.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/eff45476/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java index 26150e8..70e1c59 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java +++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java @@ -522,7 +522,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/eff45476/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 cc43802..4fc0727 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 @@ -685,7 +685,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa 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/eff45476/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 6427b29..5626f12 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 @@ -2323,7 +2323,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { @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) @@ -2335,7 +2335,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { @Override public void unableToMonitorLockNode(final Throwable e) { - Halt.halt(0, new Runnable() { + Halt.halt(1, new Runnable() { @Override public void run() { log.error("Lost ability to monitor tablet server lock, exiting.", e); http://git-wip-us.apache.org/repos/asf/accumulo/blob/eff45476/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java index 1c9c5b9..3b0f9d7 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java @@ -253,7 +253,7 @@ public class TabletServerLogger { } else { log.error("Repeatedly failed to create WAL. Going to exit tabletserver.", t); // We didn't have retries or we failed too many times. - Halt.halt("Experienced too many errors creating WALs, giving up"); + Halt.halt("Experienced too many errors creating WALs, giving up", 1); } // The exception will trigger the log creation to be re-attempted. http://git-wip-us.apache.org/repos/asf/accumulo/blob/eff45476/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java index ec28367..110eda3 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java @@ -88,7 +88,7 @@ public class NextBatchTask extends ScanTask { } catch (TooManyFilesException | SampleNotPresentException e) { addResult(e); } catch (OutOfMemoryError ome) { - Halt.halt("Ran out of memory scanning " + scanSession.extent + " for " + scanSession.client); + Halt.halt("Ran out of memory scanning " + scanSession.extent + " for " + scanSession.client, 1); addResult(ome); } catch (Throwable e) { log.warn("exception while scanning tablet " + (scanSession == null ? "(unknown)" : scanSession.extent), e);