Return-Path: 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 2F39510D2E for ; Tue, 18 Nov 2014 22:34:28 +0000 (UTC) Received: (qmail 23520 invoked by uid 500); 18 Nov 2014 22:34:28 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 23483 invoked by uid 500); 18 Nov 2014 22:34:28 -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 23474 invoked by uid 99); 18 Nov 2014 22:34:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Nov 2014 22:34:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C98559A9309; Tue, 18 Nov 2014 22:34:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Message-Id: <716ce2003e344cd9b7963b7ca071a1f0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: accumulo git commit: ACCUMULO-3342 Remove check for tracer in ZK Date: Tue, 18 Nov 2014 22:34:27 +0000 (UTC) Repository: accumulo Updated Branches: refs/heads/master a711ae97f -> 4af9f85d4 ACCUMULO-3342 Remove check for tracer in ZK Removes the MiniAccumuloCluster check to see if an existing instance is running via the existance of a tracer registration. Tracers aren't really part of "Accumulo", so much as an extra service, which also registers itself in ZK. As such, they don't really determine whether Accumulo is "running", and in any case, it is not running by default in MiniAccumuloCluster for the tests that are failing, so it's expected that this directory will not exist. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4af9f85d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4af9f85d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4af9f85d Branch: refs/heads/master Commit: 4af9f85d4fc89929870959aac430f3a02c20f20b Parents: a711ae9 Author: Christopher Tubbs Authored: Tue Nov 18 17:29:14 2014 -0500 Committer: Christopher Tubbs Committed: Tue Nov 18 17:29:14 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/util/AccumuloStatus.java | 3 --- .../test/java/org/apache/accumulo/test/functional/BulkFileIT.java | 1 - 2 files changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4af9f85d/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java b/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java index 7bd5f6d..1e75124 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java @@ -50,9 +50,6 @@ public class AccumuloStatus { if (!reader.getChildren(rootPath + Constants.ZTSERVERS + "/" + child).isEmpty()) return false; } - // TODO: check configured tracers location instead of default - if (!reader.getChildren(Constants.ZTRACERS).isEmpty()) - return false; if (!reader.getChildren(rootPath + Constants.ZMASTER_LOCK).isEmpty()) return false; if (!reader.getChildren(rootPath + Constants.ZMONITOR_LOCK).isEmpty()) http://git-wip-us.apache.org/repos/asf/accumulo/blob/4af9f85d/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java index 27a5801..22aa0cd 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java @@ -37,7 +37,6 @@ import org.apache.accumulo.core.volume.VolumeConfiguration; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; -import org.apache.accumulo.server.conf.ServerConfiguration; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path;