accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [accumulo] branch master updated: Removed more ClientInfo references from API (#799)
Date Wed, 05 Dec 2018 22:51:46 GMT
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 8836715  Removed more ClientInfo references from API (#799)
8836715 is described below

commit 8836715db7df72371d844c78fa5f1991c248f13a
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Wed Dec 5 17:51:41 2018 -0500

    Removed more ClientInfo references from API (#799)
---
 .../org/apache/accumulo/core/cli/ClientOpts.java   | 17 ++++-------------
 .../org/apache/accumulo/core/client/Instance.java  |  3 ++-
 .../core/client/MutationsRejectedException.java    | 17 +++++++++--------
 .../accumulo/core/clientImpl/ClientContext.java    |  4 ++++
 .../core/clientImpl/TabletServerBatchWriter.java   |  2 +-
 .../lib/MapReduceClientOnDefaultTable.java         |  2 +-
 .../mapreduce/lib/MapReduceClientOpts.java         |  6 ++++--
 .../lib/MapReduceClientOnDefaultTable.java         | 14 ++++++--------
 .../lib/MapReduceClientOnRequiredTable.java        | 14 ++++++--------
 .../accumulo/hadoop/its/mapreduce/RowHashIT.java   |  5 ++---
 .../apache/accumulo/cluster/AccumuloCluster.java   |  8 ++++----
 .../standalone/StandaloneAccumuloCluster.java      |  7 ++++---
 .../accumulo/minicluster/MiniAccumuloCluster.java  | 19 ++++++++++---------
 .../accumulo/minicluster/MiniAccumuloInstance.java |  2 +-
 .../miniclusterImpl/MiniAccumuloClusterImpl.java   | 16 ++++++++--------
 .../MiniAccumuloClusterExistingZooKeepersTest.java |  2 +-
 .../org/apache/accumulo/server/ServerContext.java  |  5 +++++
 .../server/cli/ServerUtilOnRequiredTable.java      |  2 +-
 .../apache/accumulo/server/cli/ServerUtilOpts.java |  4 ++--
 .../accumulo/harness/AccumuloClusterHarness.java   |  8 +++++++-
 .../apache/accumulo/test/ConditionalWriterIT.java  |  2 +-
 .../org/apache/accumulo/test/ShellServerIT.java    |  3 ++-
 .../BalanceInPresenceOfOfflineTableIT.java         |  4 ++--
 .../apache/accumulo/test/functional/BulkIT.java    |  4 ++--
 .../test/functional/BulkSplitOptimizationIT.java   |  2 +-
 .../test/functional/ChaoticBalancerIT.java         |  4 ++--
 .../accumulo/test/functional/CompactionIT.java     |  2 +-
 .../test/functional/ConfigurableMacBase.java       |  5 +++++
 .../apache/accumulo/test/functional/DeleteIT.java  |  4 ++--
 .../test/functional/DynamicThreadPoolsIT.java      |  2 +-
 .../accumulo/test/functional/FateStarvationIT.java |  2 +-
 .../test/functional/GarbageCollectorIT.java        |  4 ++--
 .../test/functional/HalfDeadTServerIT.java         |  2 +-
 .../accumulo/test/functional/MasterFailoverIT.java |  4 ++--
 .../apache/accumulo/test/functional/MaxOpenIT.java |  2 +-
 .../accumulo/test/functional/ReadWriteIT.java      |  4 ++--
 .../apache/accumulo/test/functional/RenameIT.java  |  4 ++--
 .../apache/accumulo/test/functional/RestartIT.java | 22 +++++++++++-----------
 .../accumulo/test/functional/RestartStressIT.java  |  2 +-
 .../test/functional/SimpleBalancerFairnessIT.java  |  2 +-
 .../apache/accumulo/test/functional/SplitIT.java   |  4 ++--
 .../apache/accumulo/test/functional/TableIT.java   |  4 ++--
 .../test/functional/WriteAheadLogEncryptedIT.java  |  4 ++--
 .../accumulo/test/functional/WriteAheadLogIT.java  |  4 ++--
 .../accumulo/test/functional/WriteLotsIT.java      |  4 ++--
 .../accumulo/test/proxy/SimpleProxyBase.java       |  2 +-
 46 files changed, 136 insertions(+), 123 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index 3137db7..21e1561 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@ -24,7 +24,6 @@ import java.util.Properties;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.Accumulo;
 import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.clientImpl.ClientInfoImpl;
 import org.apache.accumulo.core.conf.ClientProperty;
@@ -99,7 +98,7 @@ public class ClientOpts extends Help {
   private Password securePassword = null;
 
   public AuthenticationToken getToken() {
-    return getClientInfo().getAuthenticationToken();
+    return ClientProperty.getAuthenticationToken(getClientProperties());
   }
 
   @Parameter(names = {"-z", "--keepers"},
@@ -154,27 +153,19 @@ public class ClientOpts extends Help {
     startTracing(programName);
   }
 
-  private ClientInfo cachedInfo = null;
   private AccumuloClient cachedAccumuloClient = null;
   private Properties cachedProps = null;
 
   public String getPrincipal() {
-    return getClientInfo().getPrincipal();
+    return ClientProperty.AUTH_PRINCIPAL.getValue(getClientProperties());
   }
 
   public void setPrincipal(String principal) {
     this.principal = principal;
   }
 
-  public void setClientInfo(ClientInfo info) {
-    this.cachedInfo = info;
-  }
-
-  public ClientInfo getClientInfo() {
-    if (cachedInfo == null) {
-      cachedInfo = ClientInfo.from(getClientProperties());
-    }
-    return cachedInfo;
+  public void setClientProperties(Properties clientProps) {
+    this.cachedProps = clientProps;
   }
 
   public AccumuloClient getClient() {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Instance.java b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
index 9fbc547..5a242f0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
@@ -26,7 +26,8 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken;
  * This class represents the information a client needs to know to connect to an instance of
  * accumulo.
  *
- * @deprecated since 2.0.0, use {@link Accumulo#newClient()} and {@link ClientInfo} instead
+ * @deprecated since 2.0.0, use {@link Accumulo#newClient()} and {@link java.util.Properties}
+ *             instead
  */
 @Deprecated
 public interface Instance {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
index f06b0d2..2e670bc 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
@@ -22,6 +22,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Properties;
 import java.util.Set;
 
 import org.apache.accumulo.core.client.security.SecurityErrorCode;
@@ -55,7 +56,7 @@ public class MutationsRejectedException extends AccumuloException {
    *
    * @since 1.7.0
    * @deprecated since 2.0.0, replaced by
-   *             {@link #MutationsRejectedException(ClientInfo, List, Map, Collection, int, Throwable)}
+   *             {@link #MutationsRejectedException(Properties, List, Map, Collection, int, Throwable)}
    */
   @Deprecated
   public MutationsRejectedException(Instance instance, List<ConstraintViolationSummary> cvsList,
@@ -74,8 +75,8 @@ public class MutationsRejectedException extends AccumuloException {
   /**
    * Creates Mutations rejected exception
    *
-   * @param info
-   *          Client info
+   * @param clientProps
+   *          Client props
    * @param cvsList
    *          list of constraint violations
    * @param hashMap
@@ -87,12 +88,12 @@ public class MutationsRejectedException extends AccumuloException {
    *
    * @since 2.0.0
    */
-  public MutationsRejectedException(ClientInfo info, List<ConstraintViolationSummary> cvsList,
-      Map<TabletId,Set<SecurityErrorCode>> hashMap, Collection<String> serverSideErrors,
-      int unknownErrors, Throwable cause) {
+  public MutationsRejectedException(Properties clientProps,
+      List<ConstraintViolationSummary> cvsList, Map<TabletId,Set<SecurityErrorCode>> hashMap,
+      Collection<String> serverSideErrors, int unknownErrors, Throwable cause) {
     super("# constraint violations : " + cvsList.size() + "  security codes: "
-        + format(hashMap, new ClientContext(info)) + "  # server errors " + serverSideErrors.size()
-        + " # exceptions " + unknownErrors, cause);
+        + format(hashMap, new ClientContext(clientProps)) + "  # server errors "
+        + serverSideErrors.size() + " # exceptions " + unknownErrors, cause);
     this.cvsl = cvsList;
     this.af = hashMap;
     this.es = serverSideErrors;
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index 73f380e..d80ddba 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -97,6 +97,10 @@ public class ClientContext {
     this(ClientInfo.from(client.properties(), ((AccumuloClientImpl) client).token()));
   }
 
+  public ClientContext(Properties clientProperties) {
+    this(ClientInfo.from(clientProperties));
+  }
+
   public ClientContext(ClientInfo info) {
     this(info, ClientConfConverter.toAccumuloConf(info.getProperties()));
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
index ce2aa1c..2139120 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
@@ -568,7 +568,7 @@ public class TabletServerBatchWriter {
         af.put(new TabletIdImpl(entry.getKey()), codes);
       }
 
-      throw new MutationsRejectedException(context.getClientInfo(), cvsList, af, serverSideErrors,
+      throw new MutationsRejectedException(context.getProperties(), cvsList, af, serverSideErrors,
           unknownErrors, lastUnknownError);
     }
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOnDefaultTable.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOnDefaultTable.java
index 0183fad..3163517 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOnDefaultTable.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOnDefaultTable.java
@@ -40,7 +40,7 @@ public class MapReduceClientOnDefaultTable extends MapReduceClientOpts {
   public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
     super.setAccumuloConfigs(job);
     final String tableName = getTableName();
-    final ClientInfo info = getClientInfo();
+    final ClientInfo info = ClientInfo.from(getClientProperties());
     AccumuloInputFormat.setClientInfo(job, info);
     AccumuloInputFormat.setInputTableName(job, tableName);
     AccumuloInputFormat.setScanAuthorizations(job, auths);
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOpts.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOpts.java
index 27c6022..9d6ab72 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/MapReduceClientOpts.java
@@ -20,6 +20,7 @@ import org.apache.accumulo.core.cli.ClientOpts;
 import org.apache.accumulo.core.client.Accumulo;
 import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.admin.DelegationTokenConfig;
 import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
@@ -38,8 +39,9 @@ public class MapReduceClientOpts extends ClientOpts {
   private static final Logger log = LoggerFactory.getLogger(MapReduceClientOpts.class);
 
   public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
-    AccumuloInputFormat.setClientInfo(job, this.getClientInfo());
-    AccumuloOutputFormat.setClientInfo(job, this.getClientInfo());
+    ClientInfo info = ClientInfo.from(this.getClientProperties());
+    AccumuloInputFormat.setClientInfo(job, info);
+    AccumuloOutputFormat.setClientInfo(job, info);
   }
 
   @Override
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/MapReduceClientOnDefaultTable.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/MapReduceClientOnDefaultTable.java
index 84bc0bb..3d7eeab 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/MapReduceClientOnDefaultTable.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/MapReduceClientOnDefaultTable.java
@@ -16,11 +16,10 @@
  */
 package org.apache.accumulo.hadoopImpl.mapreduce.lib;
 
-import java.io.IOException;
+import java.util.Properties;
 
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.hadoop.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.hadoop.mapreduce.AccumuloOutputFormat;
 import org.apache.hadoop.mapreduce.Job;
@@ -40,13 +39,12 @@ public class MapReduceClientOnDefaultTable extends MapReduceClientOpts {
   }
 
   @Override
-  public void setAccumuloConfigs(Job job)
-      throws IOException, AccumuloException, AccumuloSecurityException {
+  public void setAccumuloConfigs(Job job) throws AccumuloException, AccumuloSecurityException {
     final String tableName = getTableName();
-    final ClientInfo info = getClientInfo();
-    AccumuloInputFormat.configure().clientProperties(info.getProperties()).table(tableName)
-        .auths(auths).store(job);
-    AccumuloOutputFormat.configure().clientProperties(info.getProperties()).defaultTable(tableName)
+    final Properties clientProps = getClientProperties();
+    AccumuloInputFormat.configure().clientProperties(clientProps).table(tableName).auths(auths)
+        .store(job);
+    AccumuloOutputFormat.configure().clientProperties(clientProps).defaultTable(tableName)
         .createTables().store(job);
   }
 
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/MapReduceClientOnRequiredTable.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/MapReduceClientOnRequiredTable.java
index 1a63d59..a2bb14f 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/MapReduceClientOnRequiredTable.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/MapReduceClientOnRequiredTable.java
@@ -16,11 +16,10 @@
  */
 package org.apache.accumulo.hadoopImpl.mapreduce.lib;
 
-import java.io.IOException;
+import java.util.Properties;
 
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.hadoop.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.hadoop.mapreduce.AccumuloOutputFormat;
 import org.apache.hadoop.mapreduce.Job;
@@ -33,13 +32,12 @@ public class MapReduceClientOnRequiredTable extends MapReduceClientOpts {
   private String tableName;
 
   @Override
-  public void setAccumuloConfigs(Job job)
-      throws IOException, AccumuloException, AccumuloSecurityException {
+  public void setAccumuloConfigs(Job job) throws AccumuloException, AccumuloSecurityException {
     final String tableName = getTableName();
-    final ClientInfo info = getClientInfo();
-    AccumuloInputFormat.configure().clientProperties(info.getProperties()).table(tableName)
-        .auths(auths).store(job);
-    AccumuloOutputFormat.configure().clientProperties(info.getProperties()).defaultTable(tableName)
+    final Properties clientProps = getClientProperties();
+    AccumuloInputFormat.configure().clientProperties(clientProps).table(tableName).auths(auths)
+        .store(job);
+    AccumuloOutputFormat.configure().clientProperties(clientProps).defaultTable(tableName)
         .createTables().store(job);
   }
 
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/RowHashIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/RowHashIT.java
index 0b40cdf..aa64aa8 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/RowHashIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/RowHashIT.java
@@ -151,7 +151,7 @@ public class RowHashIT extends ConfigurableMacBase {
       Text cf = new Text(idx < 0 ? col : col.substring(0, idx));
       Text cq = idx < 0 ? null : new Text(col.substring(idx + 1));
       if (cf.getLength() > 0)
-        AccumuloInputFormat.configure().clientProperties(opts.getClientInfo().getProperties())
+        AccumuloInputFormat.configure().clientProperties(opts.getClientProperties())
             .table(opts.getTableName()).auths(Authorizations.EMPTY)
             .fetchColumns(Collections.singleton(new IteratorSetting.Column(cf, cq))).store(job);
 
@@ -162,8 +162,7 @@ public class RowHashIT extends ConfigurableMacBase {
       job.setNumReduceTasks(0);
 
       job.setOutputFormatClass(AccumuloOutputFormat.class);
-      AccumuloOutputFormat.configure().clientProperties(opts.getClientInfo().getProperties())
-          .store(job);
+      AccumuloOutputFormat.configure().clientProperties(opts.getClientProperties()).store(job);
 
       job.waitForCompletion(true);
       return job.isSuccessful() ? 0 : 1;
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java
index 663c97e..0be85ad 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java
@@ -17,11 +17,11 @@
 package org.apache.accumulo.cluster;
 
 import java.io.IOException;
+import java.util.Properties;
 
 import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.server.ServerContext;
@@ -63,15 +63,15 @@ public interface AccumuloCluster {
   /**
    * Get the client configuration for the cluster
    *
-   * @deprecated since 2.0.0, replaced by {@link #getClientInfo()}
+   * @deprecated since 2.0.0, replaced by {@link #getClientProperties()}}
    */
   @Deprecated
   org.apache.accumulo.core.client.ClientConfiguration getClientConfig();
 
   /**
-   * @return Connection Info for cluster
+   * @return client connection info for cluster
    */
-  ClientInfo getClientInfo();
+  Properties getClientProperties();
 
   /**
    * Get server side config derived from accumulo.properties
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
index fed0ce1..5870535 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Properties;
 
 import org.apache.accumulo.cluster.AccumuloCluster;
 import org.apache.accumulo.cluster.ClusterUser;
@@ -132,7 +133,7 @@ public class StandaloneAccumuloCluster implements AccumuloCluster {
   @Override
   public synchronized ServerContext getServerContext() {
     if (context == null) {
-      context = new ServerContext(siteConfig, getClientInfo());
+      context = new ServerContext(siteConfig, getClientProperties());
     }
     return context;
   }
@@ -149,8 +150,8 @@ public class StandaloneAccumuloCluster implements AccumuloCluster {
   }
 
   @Override
-  public ClientInfo getClientInfo() {
-    return info;
+  public Properties getClientProperties() {
+    return info.getProperties();
   }
 
   @Override
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
index 72a6955..e830551 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
@@ -18,14 +18,15 @@ package org.apache.accumulo.minicluster;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Properties;
 import java.util.Set;
 
 import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.clientImpl.ClientInfoImpl;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
@@ -137,7 +138,7 @@ public class MiniAccumuloCluster {
 
   /**
    * @since 1.6.0
-   * @deprecated since 2.0.0, replaced by {@link #getClientInfo()}
+   * @deprecated since 2.0.0, replaced by {@link #getClientProperties()}
    */
   @Deprecated
   public org.apache.accumulo.core.client.ClientConfiguration getClientConfig() {
@@ -145,24 +146,24 @@ public class MiniAccumuloCluster {
   }
 
   /**
-   * @return Connection info for cluster
+   * @return Connection properties for cluster
    * @since 2.0.0
    */
-  public ClientInfo getClientInfo() {
-    return impl.getClientInfo();
+  public Properties getClientProperties() {
+    return impl.getClientProperties();
   }
 
   /**
-   * Construct a {@link ClientInfo} using a {@link MiniAccumuloCluster} directory
+   * Construct client {@link Properties} using a {@link MiniAccumuloCluster} directory
    *
    * @param directory
    *          MiniAccumuloCluster directory
-   * @return {@link ClientInfo} for that directory
+   * @return {@link Properties} for that directory
    * @since 2.0.0
    */
-  public static ClientInfo getClientInfo(File directory) {
+  public static Properties getClientProperties(File directory) {
     File clientProps = new File(new File(directory, "conf"), "accumulo-client.properties");
     Preconditions.checkArgument(clientProps.exists());
-    return ClientInfo.from(clientProps.toPath());
+    return ClientInfoImpl.toProperties(clientProps.toPath());
   }
 }
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
index bb758d8..eeacdb1 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
@@ -24,7 +24,7 @@ import org.apache.accumulo.core.conf.SiteConfiguration;
 
 /**
  * @since 1.6.0
- * @deprecated since 2.0.0, Use {@link MiniAccumuloCluster#getClientInfo(File)} instead
+ * @deprecated since 2.0.0, Use {@link MiniAccumuloCluster#getClientProperties(File)} instead
  */
 @Deprecated
 public class MiniAccumuloInstance extends org.apache.accumulo.core.client.ZooKeeperInstance {
diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
index 6ac09f8..2c840ce 100644
--- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
@@ -58,7 +58,6 @@ import org.apache.accumulo.core.client.Accumulo;
 import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.clientImpl.ClientContext;
 import org.apache.accumulo.core.clientImpl.MasterClient;
@@ -175,7 +174,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   private String dfsUri;
   private SiteConfiguration siteConfig;
   private ServerContext context;
-  private ClientInfo clientInfo;
+  private Properties clientProperties;
 
   public List<LogWriter> getLogWriters() {
     return logWriters;
@@ -782,7 +781,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
 
   @Override
   public AccumuloClient getAccumuloClient(String user, AuthenticationToken token) {
-    return Accumulo.newClient().from(getClientInfo().getProperties()).as(user, token).build();
+    return Accumulo.newClient().from(getClientProperties()).as(user, token).build();
   }
 
   @SuppressWarnings("deprecation")
@@ -793,11 +792,12 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   }
 
   @Override
-  public ClientInfo getClientInfo() {
-    if (clientInfo == null) {
-      clientInfo = ClientInfo.from(config.getClientPropsFile().toPath());
+  public synchronized Properties getClientProperties() {
+    if (clientProperties == null) {
+      clientProperties = Accumulo.newClientProperties().from(config.getClientPropsFile().toPath())
+          .build();
     }
-    return clientInfo;
+    return clientProperties;
   }
 
   @Override
@@ -843,7 +843,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
     MasterClientService.Iface client = null;
     while (true) {
       try {
-        ClientContext context = new ClientContext(getClientInfo());
+        ClientContext context = new ClientContext(getClientProperties());
         client = MasterClient.getConnectionWithRetry(context);
         return client.getMasterStats(Tracer.traceInfo(), context.rpcCreds());
       } catch (ThriftSecurityException exception) {
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
index a275563..605ac9a 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
@@ -93,7 +93,7 @@ public class MiniAccumuloClusterExistingZooKeepersTest {
   @Test
   public void canConnectViaExistingZooKeeper() throws Exception {
     org.apache.accumulo.core.client.Connector conn = accumulo.getConnector("root", SECRET);
-    ClientContext context = new ClientContext(accumulo.getClientInfo());
+    ClientContext context = new ClientContext(accumulo.getClientProperties());
     assertEquals(zooKeeper.getConnectString(), context.getZooKeepers());
 
     String tableName = "foo";
diff --git a/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java b/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
index e1fdfba..8106baf 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 
 import java.io.IOException;
 import java.util.Objects;
+import java.util.Properties;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.Accumulo;
@@ -81,6 +82,10 @@ public class ServerContext extends ClientContext {
     this(new ServerInfo(siteConfig, instanceName, zooKeepers, zooKeepersSessionTimeOut));
   }
 
+  public ServerContext(SiteConfiguration siteConfig, Properties clientProps) {
+    this(siteConfig, ClientInfo.from(clientProps));
+  }
+
   public ServerContext(SiteConfiguration siteConfig, ClientInfo info) {
     this(new ServerInfo(siteConfig, info.getInstanceName(), info.getZooKeepers(),
         info.getZooKeepersSessionTimeOut()));
diff --git a/server/base/src/main/java/org/apache/accumulo/server/cli/ServerUtilOnRequiredTable.java b/server/base/src/main/java/org/apache/accumulo/server/cli/ServerUtilOnRequiredTable.java
index 305bbcb..c44210d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/cli/ServerUtilOnRequiredTable.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/cli/ServerUtilOnRequiredTable.java
@@ -32,7 +32,7 @@ public class ServerUtilOnRequiredTable extends ClientOnRequiredTable {
       if (instance == null) {
         context = new ServerContext(new SiteConfiguration());
       } else {
-        context = new ServerContext(new SiteConfiguration(), getClientInfo());
+        context = new ServerContext(new SiteConfiguration(), getClientProperties());
       }
     }
     return context;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/cli/ServerUtilOpts.java b/server/base/src/main/java/org/apache/accumulo/server/cli/ServerUtilOpts.java
index 0d0b07e..598f236 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/cli/ServerUtilOpts.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/cli/ServerUtilOpts.java
@@ -27,7 +27,7 @@ public class ServerUtilOpts extends ClientOpts {
   }
 
   public ClientContext getClientContext() {
-    return new ClientContext(getClientInfo());
+    return new ClientContext(getClientProperties());
   }
 
   private ServerContext context;
@@ -37,7 +37,7 @@ public class ServerUtilOpts extends ClientOpts {
       if (instance == null) {
         context = new ServerContext(new SiteConfiguration());
       } else {
-        context = new ServerContext(new SiteConfiguration(), getClientInfo());
+        context = new ServerContext(new SiteConfiguration(), getClientProperties());
       }
     }
     return context;
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 bb9628a..bb585de 100644
--- a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
+++ b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
@@ -21,6 +21,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import java.util.Properties;
 
 import org.apache.accumulo.cluster.AccumuloCluster;
 import org.apache.accumulo.cluster.ClusterControl;
@@ -266,9 +267,14 @@ public abstract class AccumuloClusterHarness extends AccumuloITBase
     return clusterConf.getAdminPrincipal();
   }
 
+  public static Properties getClientProperties() {
+    checkState(initialized);
+    return getCluster().getClientProperties();
+  }
+
   public static ClientInfo getClientInfo() {
     checkState(initialized);
-    return getCluster().getClientInfo();
+    return ClientInfo.from(getCluster().getClientProperties());
   }
 
   public static ClientContext getClientContext() {
diff --git a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
index a74e7de..2b65f1b 100644
--- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -1547,7 +1547,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
       String tableName = getUniqueNames(1)[0];
       client.tableOperations().create(tableName);
 
-      DistributedTrace.enable("localhost", "testTrace", mac.getClientInfo().getProperties());
+      DistributedTrace.enable("localhost", "testTrace", mac.getClientProperties());
       sleepUninterruptibly(1, TimeUnit.SECONDS);
       Span root = Trace.on("traceTest");
       try (ConditionalWriter cw = client.createConditionalWriter(tableName,
diff --git a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
index a09a32d..17b4160 100644
--- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
@@ -370,7 +370,8 @@ public class ShellServerIT extends SharedMiniClusterBase {
     ts.exec("exporttable -t " + table + " " + exportUri, true);
     DistCp cp = newDistCp(new Configuration(false));
     String import_ = "file://" + new File(rootPath, "ShellServerIT.import");
-    if (getCluster().getClientInfo().saslEnabled()) {
+    ClientInfo info = ClientInfo.from(getCluster().getClientProperties());
+    if (info.saslEnabled()) {
       // DistCp bugs out trying to get a fs delegation token to perform the cp. Just copy it
       // ourselves by hand.
       FileSystem fs = getCluster().getFileSystem();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
index b99739f..5050d26 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
@@ -131,8 +131,8 @@ public class BalanceInPresenceOfOfflineTableIT extends AccumuloClusterHarness {
 
     TestIngest.Opts opts = new TestIngest.Opts();
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
-    opts.setClientInfo(getClientInfo());
-    vopts.setClientInfo(getClientInfo());
+    opts.setClientProperties(getClientProperties());
+    vopts.setClientProperties(getClientProperties());
     vopts.rows = opts.rows = 200000;
     opts.setTableName(TEST_TABLE);
     TestIngest.ingest(accumuloClient, opts, new BatchWriterOpts());
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
index df88c83..9cb7679 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
@@ -99,7 +99,7 @@ public class BulkIT extends AccumuloClusterHarness {
     opts.rows = N;
     opts.cols = 1;
     opts.setTableName(tableName);
-    opts.setClientInfo(info);
+    opts.setClientProperties(info.getProperties());
     opts.conf = new Configuration(false);
     opts.fs = fs;
     String fileFormat = filePrefix + "rf%02d";
@@ -118,7 +118,7 @@ public class BulkIT extends AccumuloClusterHarness {
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
     vopts.setTableName(tableName);
     vopts.random = 56;
-    vopts.setClientInfo(info);
+    vopts.setClientProperties(info.getProperties());
     for (int i = 0; i < COUNT; i++) {
       vopts.startRow = i * N;
       vopts.rows = N;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
index 1372e00..340b827 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
@@ -118,7 +118,7 @@ public class BulkSplitOptimizationIT extends AccumuloClusterHarness {
       opts.cols = 1;
       opts.setTableName(tableName);
 
-      opts.setClientInfo(getClientInfo());
+      opts.setClientProperties(getClientProperties());
       VerifyIngest.verifyIngest(c, opts, new ScannerOpts());
 
       // ensure each tablet does not have all map files, should be ~2.5 files per tablet
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
index 8c2ee60..21b300e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
@@ -68,8 +68,8 @@ public class ChaoticBalancerIT extends AccumuloClusterHarness {
       vopts.rows = opts.rows = 20000;
       opts.setTableName(tableName);
       vopts.setTableName(tableName);
-      opts.setClientInfo(getClientInfo());
-      vopts.setClientInfo(getClientInfo());
+      opts.setClientProperties(getClientProperties());
+      vopts.setClientProperties(getClientProperties());
       TestIngest.ingest(c, opts, new BatchWriterOpts());
       c.tableOperations().flush(tableName, null, null, true);
       VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index 30a221a..f26f0b8 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@ -139,7 +139,7 @@ public class CompactionIT extends AccumuloClusterHarness {
                 opts.dataSize = 50;
                 opts.cols = 1;
                 opts.setTableName(tableName);
-                opts.setClientInfo(getClientInfo());
+                opts.setClientProperties(getClientProperties());
                 VerifyIngest.verifyIngest(c, opts, new ScannerOpts());
               } catch (Exception ex) {
                 log.warn("Got exception verifying data", ex);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
index f524b02..246fff9 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
@@ -24,6 +24,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Map;
+import java.util.Properties;
 
 import org.apache.accumulo.core.client.Accumulo;
 import org.apache.accumulo.core.client.AccumuloClient;
@@ -201,6 +202,10 @@ public class ConfigurableMacBase extends AccumuloITBase {
     return new ClientContext(getClientInfo());
   }
 
+  protected Properties getClientProperties() {
+    return getClientInfo().getProperties();
+  }
+
   protected ClientInfo getClientInfo() {
     return ClientInfo.from(Accumulo.newClientProperties()
         .to(getCluster().getInstanceName(), getCluster().getZooKeepers()).as("root", ROOT_PASSWORD)
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java
index 3c09d05..7e10be2 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java
@@ -69,8 +69,8 @@ public class DeleteIT extends AccumuloClusterHarness {
     vopts.random = opts.random = 56;
 
     assertTrue("Expected one of password or keytab", null != password || null != keytab);
-    opts.setClientInfo(getClientInfo());
-    vopts.setClientInfo(getClientInfo());
+    opts.setClientProperties(getClientProperties());
+    vopts.setClientProperties(getClientProperties());
 
     BatchWriterOpts BWOPTS = new BatchWriterOpts();
     TestIngest.ingest(c, opts, BWOPTS);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
index ab0e193..ed98fd2 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
@@ -88,7 +88,7 @@ public class DynamicThreadPoolsIT extends AccumuloClusterHarness {
       opts.rows = 500 * 1000;
       opts.createTable = true;
       opts.setTableName(firstTable);
-      opts.setClientInfo(getClientInfo());
+      opts.setClientProperties(getClientProperties());
       TestIngest.ingest(c, opts, new BatchWriterOpts());
       c.tableOperations().flush(firstTable, null, null, true);
       for (int i = 1; i < tables.length; i++)
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
index 4bbbb1a..e1ca4e5 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
@@ -53,7 +53,7 @@ public class FateStarvationIT extends AccumuloClusterHarness {
       opts.rows = 100000;
       opts.cols = 1;
       opts.setTableName(tableName);
-      opts.setClientInfo(getClientInfo());
+      opts.setClientProperties(getClientProperties());
       TestIngest.ingest(c, opts, new BatchWriterOpts());
 
       c.tableOperations().flush(tableName, null, null, true);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index 0ce534c..c8101ee 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@ -122,8 +122,8 @@ public class GarbageCollectorIT extends ConfigurableMacBase {
       VerifyIngest.Opts vopts = new VerifyIngest.Opts();
       vopts.rows = opts.rows = 10000;
       vopts.cols = opts.cols = 1;
-      opts.setClientInfo(getClientInfo());
-      vopts.setClientInfo(getClientInfo());
+      opts.setClientProperties(getClientProperties());
+      vopts.setClientProperties(getClientProperties());
       TestIngest.ingest(c, cluster.getFileSystem(), opts, new BatchWriterOpts());
       c.tableOperations().compact("test_ingest", null, null, true, true);
       int before = countFiles();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
index b6a7df9..1c20a30 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
@@ -173,7 +173,7 @@ public class HalfDeadTServerIT extends ConfigurableMacBase {
           assertEquals(0, ingest.waitFor());
           VerifyIngest.Opts vopts = new VerifyIngest.Opts();
           vopts.rows = rows;
-          vopts.setClientInfo(getClientInfo());
+          vopts.setClientProperties(getClientProperties());
           VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
         } else {
           sleepUninterruptibly(5, TimeUnit.SECONDS);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
index 6b8661e..ee50b5c 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
@@ -54,7 +54,7 @@ public class MasterFailoverIT extends AccumuloClusterHarness {
       c.tableOperations().create(names[0]);
       TestIngest.Opts opts = new TestIngest.Opts();
       opts.setTableName(names[0]);
-      opts.setClientInfo(getClientInfo());
+      opts.setClientProperties(getClientProperties());
       TestIngest.ingest(c, opts, new BatchWriterOpts());
 
       ClusterControl control = cluster.getClusterControl();
@@ -65,7 +65,7 @@ public class MasterFailoverIT extends AccumuloClusterHarness {
       c.tableOperations().rename(names[0], names[1]);
       VerifyIngest.Opts vopts = new VerifyIngest.Opts();
       vopts.setTableName(names[1]);
-      vopts.setClientInfo(getClientInfo());
+      vopts.setClientProperties(getClientProperties());
       VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
     }
   }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
index 4586064..05ae5dd 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
@@ -111,7 +111,7 @@ public class MaxOpenIT extends AccumuloClusterHarness {
         opts.cols = 1;
         opts.random = i;
         opts.setTableName(tableName);
-        opts.setClientInfo(getClientInfo());
+        opts.setClientProperties(getClientProperties());
         TestIngest.ingest(c, opts, new BatchWriterOpts());
 
         c.tableOperations().flush(tableName, null, null, true);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index dc4696e..59b3143 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -220,7 +220,7 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     opts.columnFamily = colf;
     opts.createTable = true;
     opts.setTableName(tableName);
-    opts.setClientInfo(info);
+    opts.setClientProperties(info.getProperties());
 
     TestIngest.ingest(accumuloClient, opts, new BatchWriterOpts());
   }
@@ -240,7 +240,7 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     opts.startRow = offset;
     opts.columnFamily = colf;
     opts.setTableName(tableName);
-    opts.setClientInfo(info);
+    opts.setClientProperties(info.getProperties());
 
     VerifyIngest.verifyIngest(accumuloClient, opts, scannerOpts);
   }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RenameIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RenameIT.java
index 6998656..4f2e16a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RenameIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RenameIT.java
@@ -41,14 +41,14 @@ public class RenameIT extends AccumuloClusterHarness {
     TestIngest.Opts opts = new TestIngest.Opts();
     opts.createTable = true;
     opts.setTableName(name1);
-    opts.setClientInfo(cluster.getClientInfo());
+    opts.setClientProperties(cluster.getClientProperties());
 
     try (AccumuloClient c = getAccumuloClient()) {
       TestIngest.ingest(c, opts, bwOpts);
       c.tableOperations().rename(name1, name2);
       TestIngest.ingest(c, opts, bwOpts);
       VerifyIngest.Opts vopts = new VerifyIngest.Opts();
-      vopts.setClientInfo(cluster.getClientInfo());
+      vopts.setClientProperties(cluster.getClientProperties());
       vopts.setTableName(name2);
       VerifyIngest.verifyIngest(c, vopts, scanOpts);
       c.tableOperations().delete(name1);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java
index 8686273..1345fc7 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java
@@ -129,7 +129,7 @@ public class RestartIT extends AccumuloClusterHarness {
       } else {
         throw new RuntimeException("Unknown token");
       }
-      OPTS.setClientInfo(getClientInfo());
+      OPTS.setClientProperties(getClientProperties());
 
       Future<Integer> ret = svc.submit(() -> {
         try {
@@ -154,8 +154,8 @@ public class RestartIT extends AccumuloClusterHarness {
       c.tableOperations().create(tableName);
       OPTS.setTableName(tableName);
       VOPTS.setTableName(tableName);
-      OPTS.setClientInfo(getClientInfo());
-      VOPTS.setClientInfo(getClientInfo());
+      OPTS.setClientProperties(getClientProperties());
+      VOPTS.setClientProperties(getClientProperties());
       TestIngest.ingest(c, OPTS, BWOPTS);
       ClusterControl control = getCluster().getClusterControl();
 
@@ -222,8 +222,8 @@ public class RestartIT extends AccumuloClusterHarness {
       } else {
         throw new RuntimeException("Unknown token");
       }
-      OPTS.setClientInfo(getClientInfo());
-      VOPTS.setClientInfo(getClientInfo());
+      OPTS.setClientProperties(getClientProperties());
+      VOPTS.setClientProperties(getClientProperties());
 
       Future<Integer> ret = svc.submit(() -> {
         try {
@@ -262,8 +262,8 @@ public class RestartIT extends AccumuloClusterHarness {
       c.tableOperations().create(tableName);
       OPTS.setTableName(tableName);
       VOPTS.setTableName(tableName);
-      OPTS.setClientInfo(getClientInfo());
-      VOPTS.setClientInfo(getClientInfo());
+      OPTS.setClientProperties(getClientProperties());
+      VOPTS.setClientProperties(getClientProperties());
       TestIngest.ingest(c, OPTS, BWOPTS);
       VerifyIngest.verifyIngest(c, VOPTS, SOPTS);
       cluster.getClusterControl().stopAllServers(ServerType.TABLET_SERVER);
@@ -294,7 +294,7 @@ public class RestartIT extends AccumuloClusterHarness {
       String tableName = getUniqueNames(1)[0];
       c.tableOperations().create(tableName);
       OPTS.setTableName(tableName);
-      OPTS.setClientInfo(getClientInfo());
+      OPTS.setClientProperties(getClientProperties());
       TestIngest.ingest(c, OPTS, BWOPTS);
       try {
         getCluster().getClusterControl().stopAllServers(ServerType.TABLET_SERVER);
@@ -310,8 +310,8 @@ public class RestartIT extends AccumuloClusterHarness {
     try (AccumuloClient c = getAccumuloClient()) {
       String tableName = getUniqueNames(1)[0];
       VOPTS.setTableName(tableName);
-      OPTS.setClientInfo(getClientInfo());
-      VOPTS.setClientInfo(getClientInfo());
+      OPTS.setClientProperties(getClientProperties());
+      VOPTS.setClientProperties(getClientProperties());
       c.tableOperations().create(tableName);
       c.tableOperations().setProperty(tableName, Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K");
       String splitThreshold = null;
@@ -327,7 +327,7 @@ public class RestartIT extends AccumuloClusterHarness {
             "20K");
         TestIngest.Opts opts = new TestIngest.Opts();
         opts.setTableName(tableName);
-        opts.setClientInfo(getClientInfo());
+        opts.setClientProperties(getClientProperties());
         TestIngest.ingest(c, opts, BWOPTS);
         c.tableOperations().flush(tableName, null, null, false);
         VerifyIngest.verifyIngest(c, VOPTS, SOPTS);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java
index e6dc27d..8e0e26b 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java
@@ -135,7 +135,7 @@ public class RestartStressIT extends AccumuloClusterHarness {
       }
       assertEquals(0, retCode.get().intValue());
       VOPTS.setTableName(tableName);
-      VOPTS.setClientInfo(getClientInfo());
+      VOPTS.setClientProperties(getClientProperties());
       VerifyIngest.verifyIngest(c, VOPTS, SOPTS);
     }
   }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
index e278a81..807f482 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
@@ -74,7 +74,7 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacBase {
       List<String> tservers = c.instanceOperations().getTabletServers();
       TestIngest.Opts opts = new TestIngest.Opts();
       opts.rows = 50000;
-      opts.setClientInfo(getClientInfo());
+      opts.setClientProperties(getClientProperties());
       TestIngest.ingest(c, opts, new BatchWriterOpts());
       c.tableOperations().flush("test_ingest", null, null, false);
       sleepUninterruptibly(45, TimeUnit.SECONDS);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
index 207a54c..f59ed5a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
@@ -133,12 +133,12 @@ public class SplitIT extends AccumuloClusterHarness {
       VerifyIngest.Opts vopts = new VerifyIngest.Opts();
       opts.rows = 100000;
       opts.setTableName(table);
-      opts.setClientInfo(getClientInfo());
+      opts.setClientProperties(getClientProperties());
 
       TestIngest.ingest(c, opts, new BatchWriterOpts());
       vopts.rows = opts.rows;
       vopts.setTableName(table);
-      vopts.setClientInfo(getClientInfo());
+      vopts.setClientProperties(getClientProperties());
       VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
       while (c.tableOperations().listSplits(table).size() < 10) {
         sleepUninterruptibly(15, TimeUnit.SECONDS);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java
index 34b9d06..24120ff 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java
@@ -70,8 +70,8 @@ public class TableIT extends AccumuloClusterHarness {
 
       TestIngest.Opts opts = new TestIngest.Opts();
       VerifyIngest.Opts vopts = new VerifyIngest.Opts();
-      opts.setClientInfo(getClientInfo());
-      vopts.setClientInfo(getClientInfo());
+      opts.setClientProperties(getClientProperties());
+      vopts.setClientProperties(getClientProperties());
       opts.setTableName(tableName);
       TestIngest.ingest(c, opts, new BatchWriterOpts());
       to.flush(tableName, null, null, true);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogEncryptedIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogEncryptedIT.java
index 2567fb4..6fe46bf 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogEncryptedIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogEncryptedIT.java
@@ -89,8 +89,8 @@ public class WriteAheadLogEncryptedIT extends AccumuloClusterHarness {
       TestIngest.Opts opts = new TestIngest.Opts();
       VerifyIngest.Opts vopts = new VerifyIngest.Opts();
       opts.setTableName(tableName);
-      opts.setClientInfo(getClientInfo());
-      vopts.setClientInfo(getClientInfo());
+      opts.setClientProperties(getClientProperties());
+      vopts.setClientProperties(getClientProperties());
 
       TestIngest.ingest(c, opts, new BatchWriterOpts());
       vopts.setTableName(tableName);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
index c60f23c..93cbc58 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
@@ -56,8 +56,8 @@ public class WriteAheadLogIT extends AccumuloClusterHarness {
       TestIngest.Opts opts = new TestIngest.Opts();
       VerifyIngest.Opts vopts = new VerifyIngest.Opts();
       opts.setTableName(tableName);
-      opts.setClientInfo(getClientInfo());
-      vopts.setClientInfo(getClientInfo());
+      opts.setClientProperties(getClientProperties());
+      vopts.setClientProperties(getClientProperties());
 
       TestIngest.ingest(c, opts, new BatchWriterOpts());
       vopts.setTableName(tableName);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
index 23c8745..029c0de 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
@@ -55,7 +55,7 @@ public class WriteLotsIT extends AccumuloClusterHarness {
               opts.startRow = index * 10000;
               opts.rows = 10000;
               opts.setTableName(tableName);
-              opts.setClientInfo(getClientInfo());
+              opts.setClientProperties(getClientProperties());
               BatchWriterOpts bwOpts = new BatchWriterOpts();
               bwOpts.batchMemory = 1024L * 1024;
               bwOpts.batchThreads = 2;
@@ -75,7 +75,7 @@ public class WriteLotsIT extends AccumuloClusterHarness {
       VerifyIngest.Opts vopts = new VerifyIngest.Opts();
       vopts.rows = 10000 * THREADS;
       vopts.setTableName(tableName);
-      vopts.setClientInfo(getClientInfo());
+      vopts.setClientProperties(getClientProperties());
       VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
     }
   }
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
index b1bd022..f3babd9 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
@@ -228,7 +228,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
       }
 
       props.put("tokenClass", tokenClass);
-      props.putAll(SharedMiniClusterBase.getCluster().getClientInfo().getProperties());
+      props.putAll(SharedMiniClusterBase.getCluster().getClientProperties());
       proxyPort = PortUtils.getRandomFreePort();
       proxyServer = Proxy.createProxyServer(HostAndPort.fromParts(hostname, proxyPort), factory,
           props).server;


Mime
View raw message