Return-Path: 
 <commits-return-7183-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 6D9551043E
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Wed, 18 Dec 2013 20:49:31 +0000 (UTC)
Received: (qmail 11621 invoked by uid 500); 18 Dec 2013 20:49:31 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 11524 invoked by uid 500); 18 Dec 2013 20:49:31 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 11511 invoked by uid 99); 18 Dec 2013 20:49:30 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Dec 2013 20:49:30 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 65EF89839; Wed, 18 Dec 2013 20:49:30 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: vines@apache.org
To: commits@accumulo.apache.org
Date: Wed, 18 Dec 2013 20:49:31 -0000
Message-Id: <2d44f8c1c9bd4834a38a9b08f8b50717@git.apache.org>
In-Reply-To: <2874e8d236614820aee3ab3987066c88@git.apache.org>
References: <2874e8d236614820aee3ab3987066c88@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] git commit: ACCUMULO-1980 No longer tries to use master to stop
 tserver if no masters

ACCUMULO-1980 No longer tries to use master to stop tserver if no masters


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f228caff
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f228caff
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f228caff

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: f228caff46816939b95f101942082a9da0277dce
Parents: 3743312
Author: John Vines <vines@apache.org>
Authored: Wed Dec 18 15:48:52 2013 -0500
Committer: John Vines <vines@apache.org>
Committed: Wed Dec 18 15:48:52 2013 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/accumulo/server/util/Admin.java     | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f228caff/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
index 698259b..1e1bc79 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -299,6 +299,10 @@ public class Admin {
 
   private static void stopTabletServer(final Instance instance, final Credentials creds, List<String> servers, final boolean force) throws AccumuloException,
       AccumuloSecurityException {
+    if (instance.getMasterLocations().size() == 0) {
+      log.info("No masters running. Not attempting safe unload of tserver.");
+      return;
+    }
     for (String server : servers) {
       HostAndPort address = AddressUtil.parseAddress(server, ServerConfiguration.getDefaultConfiguration().getPort(Property.TSERV_CLIENTPORT));
       final String finalServer = address.toString();