[accumulo] branch master updated: Updates for standalone cluster (#657)

[mwalch]

This is an automated email from the ASF dual-hosted git repository.

mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new 5af231f  Updates for standalone cluster (#657)
5af231f is described below

commit 5af231fab5d2fd5f52eb9260c4cf452b47b1e49a
Author: Mike Walch <mwa...@apache.org>
AuthorDate: Mon Sep 24 11:01:04 2018 -0400

    Updates for standalone cluster (#657)
---
 TESTING.md                                                          | 1 +
 .../java/org/apache/accumulo/harness/AccumuloClusterHarness.java    | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/TESTING.md b/TESTING.md
index 6b7e389..322759e 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -111,6 +111,7 @@ To execute everything except these tests, use `mvn verify 
-Dfailsafe.excludedGro
 The following properties can be used to configure a standalone cluster:
 
 - `accumulo.it.cluster.type`, Required: The type of cluster is being defined 
(valid options: MINI and STANDALONE)
+- `accumulo.it.cluster.clientconf`, Required: Path to 
accumulo-client.properties
 - `accumulo.it.cluster.standalone.admin.principal`, Required: Standalone 
cluster principal (user) with all System permissions
 - `accumulo.it.cluster.standalone.admin.password`, Required: Password for the 
principal (only valid w/o Kerberos)
 - `accumulo.it.cluster.standalone.admin.keytab`, Required: Keytab for the 
principal (only valid w/ Kerberos)
diff --git 
a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java 
b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
index 16ffedb..7807fc8 100644
--- a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
+++ b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
@@ -137,7 +137,7 @@ public abstract class AccumuloClusterHarness extends 
AccumuloITBase
           (StandaloneAccumuloClusterConfiguration) clusterConf;
         // @formatter:on
         StandaloneAccumuloCluster standaloneCluster = new 
StandaloneAccumuloCluster(
-            cluster.getClientInfo(), conf.getTmpDirectory(), conf.getUsers(),
+            conf.getClientInfo(), conf.getTmpDirectory(), conf.getUsers(),
             conf.getServerAccumuloConfDir());
         // If these are provided in the configuration, pass them into the 
cluster
         standaloneCluster.setAccumuloHome(conf.getAccumuloHome());
@@ -145,6 +145,7 @@ public abstract class AccumuloClusterHarness extends 
AccumuloITBase
         standaloneCluster.setHadoopConfDir(conf.getHadoopConfDir());
         standaloneCluster.setServerCmdPrefix(conf.getServerCmdPrefix());
         standaloneCluster.setClientCmdPrefix(conf.getClientCmdPrefix());
+        cluster = standaloneCluster;
 
         // For SASL, we need to get the Hadoop configuration files as well 
otherwise UGI will log in
         // as SIMPLE instead of KERBEROS
@@ -155,9 +156,6 @@ public abstract class AccumuloClusterHarness extends 
AccumuloITBase
           UserGroupInformation.loginUserFromKeytab(conf.getAdminPrincipal(),
               conf.getAdminKeytab().getAbsolutePath());
         }
-
-        // Set the implementation
-        cluster = standaloneCluster;
         break;
       default:
         throw new RuntimeException("Unhandled type");