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 5F784CBDF for ; Wed, 21 Jan 2015 19:10:32 +0000 (UTC) Received: (qmail 45384 invoked by uid 500); 21 Jan 2015 18:58:17 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 27670 invoked by uid 500); 21 Jan 2015 18:57:57 -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 9073 invoked by uid 99); 21 Jan 2015 18:15:47 -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, 21 Jan 2015 18:15:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3B8FFE0835; Wed, 21 Jan 2015 18:15:47 +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: Wed, 21 Jan 2015 18:15:49 -0000 Message-Id: <42b42a58595d4494b41df9d5990a83b4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/5] accumulo git commit: ACCUMULO-3505 Remove useExistingInstance(boolean) from MiniAccumuloConfig. ACCUMULO-3505 Remove useExistingInstance(boolean) from MiniAccumuloConfig. We can't make API additions in a patch release, so we need to remove this from MAConfig. The feature is still usable via MAConfigImpl for 1.6.2. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2022d7c0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2022d7c0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2022d7c0 Branch: refs/heads/master Commit: 2022d7c08dc21ec132992f8675b326795ebbaaa1 Parents: 00ba1a1 Author: Josh Elser Authored: Wed Jan 21 13:05:05 2015 -0500 Committer: Josh Elser Committed: Wed Jan 21 13:05:05 2015 -0500 ---------------------------------------------------------------------- .../accumulo/minicluster/MiniAccumuloConfig.java | 16 ---------------- .../org/apache/accumulo/test/ExistingMacIT.java | 11 +++++------ 2 files changed, 5 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2022d7c0/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java index c8c499d..b71b771 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java @@ -17,7 +17,6 @@ package org.apache.accumulo.minicluster; import java.io.File; -import java.io.IOException; import java.util.Map; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; @@ -252,19 +251,4 @@ public class MiniAccumuloConfig { impl.setNativeLibPaths(nativePathItems); return this; } - - /** - * Informs MAC that it's running against an existing accumulo instance. It is assumed that it's already initialized and hdfs/zookeeper are already running. - * - * @param accumuloSite - * a File representation of the accumulo-site.xml file for the instance being run - * @param hadoopConfDir - * a File representation of the hadoop configuration directory containing core-site.xml and hdfs-site.xml - * - * @since 1.6.2 - */ - public MiniAccumuloConfig useExistingInstance(File accumuloSite, File hadoopConfDir) throws IOException { - impl.useExistingInstance(accumuloSite, hadoopConfDir); - return this; - } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/2022d7c0/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java index df44feb..4acf302 100644 --- a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java @@ -37,9 +37,8 @@ import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.RootTable; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.minicluster.MiniAccumuloCluster; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.minicluster.impl.ProcessReference; import org.apache.accumulo.test.functional.ConfigurableMacIT; @@ -111,10 +110,10 @@ public class ExistingMacIT extends ConfigurableMacIT { File testDir2 = createTestDir(ExistingMacIT.class.getSimpleName() + "_2"); FileUtils.deleteQuietly(testDir2); - MiniAccumuloConfig macConfig2 = new MiniAccumuloConfig(testDir2, "notused"); + MiniAccumuloConfigImpl macConfig2 = new MiniAccumuloConfigImpl(testDir2, "notused"); macConfig2.useExistingInstance(new File(getCluster().getConfig().getConfDir(), "accumulo-site.xml"), hadoopConfDir); - MiniAccumuloCluster accumulo2 = new MiniAccumuloCluster(macConfig2); + MiniAccumuloClusterImpl accumulo2 = new MiniAccumuloClusterImpl(macConfig2); accumulo2.start(); conn = accumulo2.getConnector("root", ROOT_PASSWORD); @@ -152,12 +151,12 @@ public class ExistingMacIT extends ConfigurableMacIT { File testDir2 = createTestDir(ExistingMacIT.class.getSimpleName() + "_3"); FileUtils.deleteQuietly(testDir2); - MiniAccumuloConfig macConfig2 = new MiniAccumuloConfig(testDir2, "notused"); + MiniAccumuloConfigImpl macConfig2 = new MiniAccumuloConfigImpl(testDir2, "notused"); macConfig2.useExistingInstance(new File(getCluster().getConfig().getConfDir(), "accumulo-site.xml"), hadoopConfDir); System.out.println("conf " + new File(getCluster().getConfig().getConfDir(), "accumulo-site.xml")); - MiniAccumuloCluster accumulo2 = new MiniAccumuloCluster(macConfig2); + MiniAccumuloClusterImpl accumulo2 = new MiniAccumuloClusterImpl(macConfig2); try { accumulo2.start(); Assert.fail("A 2nd MAC instance should not be able to start over an existing MAC instance");