accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [accumulo] 07/09: Replace getConnector() with getClient() #636
Date Thu, 20 Sep 2018 17:48:09 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 3f828384fe952fc0dc8d74fba630d27dc50fcc1e
Author: Mike Miller <mmiller@apache.org>
AuthorDate: Tue Sep 11 14:03:21 2018 -0400

    Replace getConnector() with getClient() #636
---
 .../core/client/mapred/AbstractInputFormat.java    |  4 +-
 .../core/client/mapreduce/AbstractInputFormat.java |  4 +-
 .../mapreduce/lib/impl/ConfiguratorBase.java       |  4 +-
 .../mapreduce/lib/impl/InputConfigurator.java      |  3 +-
 .../org/apache/accumulo/core/cli/ClientOpts.java   |  2 +-
 .../core/client/impl/AccumuloClientImpl.java       |  2 +-
 .../accumulo/core/client/impl/BulkImport.java      |  2 +-
 .../accumulo/core/client/impl/ClientContext.java   |  4 +-
 .../core/client/impl/ClientInfoFactory.java        |  2 +-
 .../accumulo/core/client/impl/OfflineIterator.java |  2 +-
 .../client/impl/ReplicationOperationsImpl.java     |  8 ++--
 .../core/client/impl/TableOperationsImpl.java      |  6 +--
 .../accumulo/core/metadata/MetadataServicer.java   |  2 +-
 .../core/metadata/TableMetadataServicer.java       |  2 +-
 .../core/metadata/schema/MetadataScanner.java      |  2 +-
 .../org/apache/accumulo/core/summary/Gatherer.java |  2 +-
 .../java/org/apache/accumulo/core/util/Merge.java  |  2 +-
 .../core/client/impl/TableOperationsImplTest.java  |  2 +-
 .../core/metadata/MetadataServicerTest.java        |  2 +-
 .../org/apache/accumulo/server/ServerContext.java  |  4 +-
 .../server/client/ClientServiceHandler.java        |  2 +-
 .../server/master/balancer/GroupBalancer.java      |  2 +-
 .../server/master/balancer/TableLoadBalancer.java  |  2 +-
 .../server/master/state/MetaDataStateStore.java    |  2 +-
 .../server/master/state/MetaDataTableScanner.java  |  2 +-
 .../accumulo/server/problems/ProblemReports.java   |  4 +-
 .../server/replication/ReplicaSystemHelper.java    |  2 +-
 .../server/replication/ReplicationUtil.java        |  6 +--
 .../org/apache/accumulo/server/util/Admin.java     |  8 ++--
 .../server/util/CheckForMetadataProblems.java      |  2 +-
 .../accumulo/server/util/ListVolumesUsed.java      |  2 +-
 .../apache/accumulo/server/util/LocalityCheck.java |  2 +-
 .../accumulo/server/util/MetadataTableUtil.java    |  4 +-
 .../apache/accumulo/server/util/RandomWriter.java  |  2 +-
 .../accumulo/server/util/RandomizeVolumes.java     |  4 +-
 .../server/util/RemoveEntriesForMissingFiles.java  |  2 +-
 .../accumulo/server/util/ReplicationTableUtil.java |  2 +-
 .../accumulo/server/util/TableDiskUsage.java       |  2 +-
 .../server/util/VerifyTabletAssignments.java       |  2 +-
 .../accumulo/gc/GarbageCollectWriteAheadLogs.java  |  2 +-
 .../apache/accumulo/gc/SimpleGarbageCollector.java | 16 +++----
 .../replication/CloseWriteAheadLogReferences.java  |  2 +-
 .../gc/GarbageCollectWriteAheadLogsTest.java       |  6 +--
 .../java/org/apache/accumulo/master/Master.java    |  6 +--
 .../master/MasterClientServiceHandler.java         |  4 +-
 .../apache/accumulo/master/TabletGroupWatcher.java | 12 ++---
 .../DistributedWorkQueueWorkAssigner.java          |  2 +-
 .../master/replication/ReplicationDriver.java      |  2 +-
 .../accumulo/master/replication/WorkDriver.java    |  4 +-
 .../apache/accumulo/master/state/MergeStats.java   |  2 +-
 .../apache/accumulo/master/tableOps/CleanUp.java   |  4 +-
 .../accumulo/master/tableOps/CompactionDriver.java |  2 +-
 .../accumulo/master/tableOps/PopulateMetadata.java |  2 +-
 .../master/tableOps/PopulateMetadataTable.java     |  2 +-
 .../accumulo/master/tableOps/WriteExportFiles.java |  6 +--
 .../tableOps/bulkVer1/CleanUpBulkImport.java       |  2 +-
 .../master/tableOps/bulkVer1/CopyFailed.java       |  2 +-
 .../tableOps/bulkVer2/CleanUpBulkImport.java       |  2 +-
 .../master/tableOps/bulkVer2/LoadFiles.java        |  2 +-
 .../java/org/apache/accumulo/monitor/Monitor.java  |  2 +-
 .../rest/replication/ReplicationResource.java      |  2 +-
 .../monitor/rest/trace/TracesResource.java         |  2 +-
 .../java/org/apache/accumulo/tracer/TraceDump.java |  4 +-
 .../apache/accumulo/tracer/TraceTableStats.java    |  2 +-
 .../BatchWriterReplicationReplayer.java            |  2 +-
 .../tserver/replication/ReplicationProcessor.java  |  2 +-
 .../BatchWriterReplicationReplayerTest.java        |  2 +-
 .../accumulo/harness/AccumuloClusterHarness.java   |  2 +-
 .../apache/accumulo/test/QueryMetadataTable.java   |  2 +-
 .../org/apache/accumulo/test/ShellServerIT.java    | 34 +++++++-------
 .../org/apache/accumulo/test/TestBinaryRows.java   |  2 +-
 .../java/org/apache/accumulo/test/TestIngest.java  |  2 +-
 .../apache/accumulo/test/TestMultiTableIngest.java |  2 +-
 .../apache/accumulo/test/TestRandomDeletes.java    |  4 +-
 .../org/apache/accumulo/test/VerifyIngest.java     |  2 +-
 .../accumulo/test/functional/AccumuloClientIT.java | 52 +++++++++++-----------
 .../test/functional/CreateInitialSplitsIT.java     |  2 +-
 .../accumulo/test/functional/WALSunnyDayIT.java    |  2 +-
 .../apache/accumulo/test/master/MergeStateIT.java  | 11 ++---
 .../accumulo/test/master/SuspendedTabletsIT.java   |  4 +-
 .../test/performance/ContinuousIngest.java         |  2 +-
 .../test/performance/scan/CollectTabletStats.java  |  4 +-
 ...GarbageCollectorCommunicatesWithTServersIT.java |  2 +-
 .../accumulo/test/replication/ReplicationIT.java   |  4 +-
 .../replication/ReplicationOperationsImplIT.java   |  2 +-
 .../test/server/security/SystemCredentialsIT.java  |  2 +-
 .../test/util/metadata/MetadataBatchScan.java      |  2 +-
 87 files changed, 175 insertions(+), 179 deletions(-)

diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
index fc8e26b..43aa684 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
@@ -381,7 +381,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
    * @since 1.5.0
    */
   protected static void validateOptions(JobConf job) throws IOException {
-    AccumuloClient conn = InputConfigurator.getConnector(CLASS, job);
+    AccumuloClient conn = InputConfigurator.getClient(CLASS, job);
     InputConfigurator.validatePermissions(CLASS, job, conn);
   }
 
@@ -484,7 +484,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
       ClientContext context = new ClientContext(getClientInfo(job));
       AccumuloClient conn;
       try {
-        conn = context.getConnector();
+        conn = context.getClient();
       } catch (AccumuloException | AccumuloSecurityException e) {
         throw new IllegalStateException(e);
       }
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
index 6b23529..a44ff03 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
@@ -398,7 +398,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
    * @since 1.5.0
    */
   protected static void validateOptions(JobContext context) throws IOException {
-    AccumuloClient conn = InputConfigurator.getConnector(CLASS, context.getConfiguration());
+    AccumuloClient conn = InputConfigurator.getClient(CLASS, context.getConfiguration());
     InputConfigurator.validatePermissions(CLASS, context.getConfiguration(), conn);
   }
 
@@ -491,7 +491,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
       ClientContext context = new ClientContext(info);
       AccumuloClient conn;
       try {
-        conn = context.getConnector();
+        conn = context.getClient();
       } catch (AccumuloException | AccumuloSecurityException e) {
         throw new IllegalStateException(e);
       }
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBase.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBase.java
index 7dc4283..6f8dffd 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBase.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBase.java
@@ -337,7 +337,7 @@ public class ConfiguratorBase {
   @Deprecated
   public static org.apache.accumulo.core.client.Instance getInstance(Class<?> implementingClass,
       Configuration conf) {
-    return Connector.from(getConnector(implementingClass, conf)).getInstance();
+    return Connector.from(getClient(implementingClass, conf)).getInstance();
   }
 
   /**
@@ -350,7 +350,7 @@ public class ConfiguratorBase {
    * @return Accumulo connector
    * @since 2.0.0
    */
-  public static AccumuloClient getConnector(Class<?> implementingClass, Configuration conf) {
+  public static AccumuloClient getClient(Class<?> implementingClass, Configuration conf) {
     try {
       return Accumulo.newClient().usingClientInfo(getClientInfo(implementingClass, conf)).build();
     } catch (AccumuloException | AccumuloSecurityException e) {
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
index 530c7f6..77680c6 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
@@ -842,8 +842,7 @@ public class InputConfigurator extends ConfiguratorBase {
 
       Range metadataRange = new Range(new KeyExtent(tableId, startRow, null).getMetadataEntry(),
           true, null, false);
-      Scanner scanner = context.getConnector().createScanner(MetadataTable.NAME,
-          Authorizations.EMPTY);
+      Scanner scanner = context.getClient().createScanner(MetadataTable.NAME, Authorizations.EMPTY);
       MetadataSchema.TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
       scanner.fetchColumnFamily(MetadataSchema.TabletsSection.LastLocationColumnFamily.NAME);
       scanner.fetchColumnFamily(MetadataSchema.TabletsSection.CurrentLocationColumnFamily.NAME);
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 bcd058d..8bdf677 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
@@ -181,7 +181,7 @@ public class ClientOpts extends Help {
     return cachedInfo;
   }
 
-  public AccumuloClient getConnector() throws AccumuloException, AccumuloSecurityException {
+  public AccumuloClient getClient() throws AccumuloException, AccumuloSecurityException {
     if (cachedAccumuloClient == null) {
       cachedAccumuloClient = Accumulo.newClient().usingClientInfo(getClientInfo()).build();
     }
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloClientImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloClientImpl.java
index fb308f8..31d2ed6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloClientImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloClientImpl.java
@@ -286,7 +286,7 @@ public class AccumuloClientImpl extends Connector implements AccumuloClient {
 
     @Override
     public AccumuloClient build() throws AccumuloException, AccumuloSecurityException {
-      return org.apache.accumulo.core.client.impl.ClientInfoFactory.getConnector(getClientInfo());
+      return org.apache.accumulo.core.client.impl.ClientInfoFactory.getClient(getClientInfo());
     }
 
     @Override
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/BulkImport.java b/core/src/main/java/org/apache/accumulo/core/client/impl/BulkImport.java
index 8b6f01a..342139b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/BulkImport.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/BulkImport.java
@@ -115,7 +115,7 @@ public class BulkImport implements ImportDestinationArguments, ImportMappingOpti
 
     Table.ID tableId = Tables.getTableId(context, tableName);
 
-    Map<String,String> props = context.getConnector().instanceOperations().getSystemConfiguration();
+    Map<String,String> props = context.getClient().instanceOperations().getSystemConfiguration();
     AccumuloConfiguration conf = new ConfigurationCopy(props);
 
     FileSystem fs = VolumeConfiguration.getVolume(dir, CachedConfiguration.getInstance(), conf)
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java
index 418358e..567d192 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java
@@ -140,7 +140,7 @@ public class ClientContext {
       @Override
       public Connector getConnector(String principal, AuthenticationToken token)
           throws AccumuloException, AccumuloSecurityException {
-        return Connector.from(context.getConnector().changeUser(principal, token));
+        return Connector.from(context.getClient().changeUser(principal, token));
       }
     };
   }
@@ -212,7 +212,7 @@ public class ClientContext {
   /**
    * Retrieve a connector
    */
-  public synchronized AccumuloClient getConnector()
+  public synchronized AccumuloClient getClient()
       throws AccumuloException, AccumuloSecurityException {
     if (conn == null) {
       conn = new AccumuloClientImpl(this);
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoFactory.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoFactory.java
index 060298e..5e406af 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoFactory.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoFactory.java
@@ -39,7 +39,7 @@ public class ClientInfoFactory {
     return property.getLong(info.getProperties());
   }
 
-  public static AccumuloClient getConnector(ClientInfo info)
+  public static AccumuloClient getClient(ClientInfo info)
       throws AccumuloSecurityException, AccumuloException {
     return new AccumuloClientImpl(new ClientContext(info));
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
index b608a70..fc2f829 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
@@ -175,7 +175,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
     this.readers = new ArrayList<>();
 
     try {
-      conn = context.getConnector();
+      conn = context.getClient();
       config = new ConfigurationCopy(conn.instanceOperations().getSiteConfiguration());
       nextTablet();
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
index 0a3a3ff..9aeca78 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
@@ -66,15 +66,15 @@ public class ReplicationOperationsImpl implements ReplicationOperations {
       throws AccumuloException, AccumuloSecurityException, PeerExistsException {
     requireNonNull(name);
     requireNonNull(replicaType);
-    context.getConnector().instanceOperations()
-        .setProperty(Property.REPLICATION_PEERS.getKey() + name, replicaType);
+    context.getClient().instanceOperations().setProperty(Property.REPLICATION_PEERS.getKey() + name,
+        replicaType);
   }
 
   @Override
   public void removePeer(final String name)
       throws AccumuloException, AccumuloSecurityException, PeerNotFoundException {
     requireNonNull(name);
-    context.getConnector().instanceOperations()
+    context.getClient().instanceOperations()
         .removeProperty(Property.REPLICATION_PEERS.getKey() + name);
   }
 
@@ -146,7 +146,7 @@ public class ReplicationOperationsImpl implements ReplicationOperations {
 
     log.debug("Collecting referenced files for replication of table {}", tableName);
 
-    AccumuloClient conn = context.getConnector();
+    AccumuloClient conn = context.getClient();
     Table.ID tableId = getTableId(conn, tableName);
 
     log.debug("Found id of {} for name {}", tableId, tableName);
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 82846a2..26eb070 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@ -1148,7 +1148,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
   private Path checkPath(String dir, String kind, String type)
       throws IOException, AccumuloException, AccumuloSecurityException {
     Path ret;
-    Map<String,String> props = context.getConnector().instanceOperations().getSystemConfiguration();
+    Map<String,String> props = context.getClient().instanceOperations().getSystemConfiguration();
     AccumuloConfiguration conf = new ConfigurationCopy(props);
 
     FileSystem fs = VolumeConfiguration.getVolume(dir, CachedConfiguration.getInstance(), conf)
@@ -1332,7 +1332,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
    */
   protected IsolatedScanner createMetadataScanner(String metaTable, Range range)
       throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
-    Scanner scanner = context.getConnector().createScanner(metaTable, Authorizations.EMPTY);
+    Scanner scanner = context.getClient().createScanner(metaTable, Authorizations.EMPTY);
     TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
     scanner.fetchColumnFamily(TabletsSection.FutureLocationColumnFamily.NAME);
     scanner.fetchColumnFamily(TabletsSection.CurrentLocationColumnFamily.NAME);
@@ -1428,7 +1428,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
       throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
     checkArgument(tableName != null, "tableName is null");
     checkArgument(auths != null, "auths is null");
-    Scanner scanner = context.getConnector().createScanner(tableName, auths);
+    Scanner scanner = context.getClient().createScanner(tableName, auths);
     return FindMax.findMax(scanner, startRow, startInclusive, endRow, endInclusive);
   }
 
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataServicer.java b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataServicer.java
index 6b96689..78c7d6c 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataServicer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataServicer.java
@@ -36,7 +36,7 @@ public abstract class MetadataServicer {
       throws AccumuloException, AccumuloSecurityException {
     checkArgument(tableName != null, "tableName is null");
     return forTableId(context,
-        Table.ID.of(context.getConnector().tableOperations().tableIdMap().get(tableName)));
+        Table.ID.of(context.getClient().tableOperations().tableIdMap().get(tableName)));
   }
 
   public static MetadataServicer forTableId(ClientContext context, Table.ID tableId) {
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/TableMetadataServicer.java b/core/src/main/java/org/apache/accumulo/core/metadata/TableMetadataServicer.java
index 833c0b7..fe28d98 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/TableMetadataServicer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/TableMetadataServicer.java
@@ -63,7 +63,7 @@ abstract class TableMetadataServicer extends MetadataServicer {
   public void getTabletLocations(SortedMap<KeyExtent,String> tablets)
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
 
-    Scanner scanner = context.getConnector().createScanner(getServicingTableName(),
+    Scanner scanner = context.getClient().createScanner(getServicingTableName(),
         Authorizations.EMPTY);
 
     TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataScanner.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataScanner.java
index e871cae..7e28630 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataScanner.java
@@ -257,7 +257,7 @@ public class MetadataScanner implements Iterable<TabletMetadata>, AutoCloseable
     @Override
     public TableOptions from(ClientContext ctx) {
       try {
-        this.conn = ctx.getConnector();
+        this.conn = ctx.getClient();
       } catch (AccumuloException | AccumuloSecurityException e) {
         throw new RuntimeException(e);
       }
diff --git a/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java b/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java
index 928a922..029e86b 100644
--- a/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java
+++ b/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java
@@ -203,7 +203,7 @@ public class Gatherer {
 
       if (location == null) {
         if (tservers == null) {
-          tservers = ctx.getConnector().instanceOperations().getTabletServers();
+          tservers = ctx.getClient().instanceOperations().getTabletServers();
           Collections.sort(tservers);
         }
 
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Merge.java b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
index 45c95c9..49f1d31 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Merge.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
@@ -88,7 +88,7 @@ public class Merge {
     opts.parseArgs(Merge.class.getName(), args);
 
     try {
-      AccumuloClient conn = opts.getConnector();
+      AccumuloClient conn = opts.getClient();
 
       if (!conn.tableOperations().exists(opts.getTableName())) {
         System.err.println("table " + opts.getTableName() + " does not exist");
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java
index 23a4e97..e9873f3 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java
@@ -41,7 +41,7 @@ public class TableOperationsImplTest {
 
     Range range = new KeyExtent(Table.ID.of("1"), null, null).toMetadataRange();
 
-    EasyMock.expect(context.getConnector()).andReturn(accumuloClient);
+    EasyMock.expect(context.getClient()).andReturn(accumuloClient);
     EasyMock.expect(accumuloClient.createScanner(tableName, Authorizations.EMPTY))
         .andReturn(scanner);
 
diff --git a/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java b/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java
index 876a721..bf98878 100644
--- a/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java
@@ -55,7 +55,7 @@ public class MetadataServicerTest {
     TableOperations tableOps = EasyMock.createMock(TableOperations.class);
     EasyMock.expect(tableOps.tableIdMap()).andReturn(tableNameToIdMap).anyTimes();
     EasyMock.expect(conn.tableOperations()).andReturn(tableOps).anyTimes();
-    EasyMock.expect(context.getConnector()).andReturn(conn).anyTimes();
+    EasyMock.expect(context.getClient()).andReturn(conn).anyTimes();
     EasyMock.replay(context, conn, tableOps);
   }
 
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 9bdaa85..5436739 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
@@ -238,7 +238,7 @@ public class ServerContext extends ClientContext {
   }
 
   @Override
-  public synchronized AccumuloClient getConnector()
+  public synchronized AccumuloClient getClient()
       throws AccumuloException, AccumuloSecurityException {
     if (conn == null) {
       conn = new AccumuloClientImpl(this);
@@ -246,7 +246,7 @@ public class ServerContext extends ClientContext {
     return conn;
   }
 
-  public AccumuloClient getConnector(String principal, AuthenticationToken token)
+  public AccumuloClient getClient(String principal, AuthenticationToken token)
       throws AccumuloSecurityException, AccumuloException {
     return new AccumuloClientImpl.AccumuloClientBuilderImpl().usingClientInfo(info)
         .usingToken(principal, token).build();
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
index 3923e90..61e14a3 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
@@ -469,7 +469,7 @@ public class ClientServiceHandler implements ClientService.Iface {
 
       // use the same set of tableIds that were validated above to avoid race conditions
       Map<TreeSet<String>,Long> diskUsage = TableDiskUsage.getDiskUsage(tableIds, fs,
-          context.getConnector());
+          context.getClient());
       List<TDiskUsage> retUsages = new ArrayList<>();
       for (Map.Entry<TreeSet<String>,Long> usageItem : diskUsage.entrySet()) {
         retUsages.add(new TDiskUsage(new ArrayList<>(usageItem.getKey()), usageItem.getValue()));
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
index 5e5a7a8..048f0c0 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
@@ -800,7 +800,7 @@ public abstract class GroupBalancer extends TabletBalancer {
     public Iterator<Pair<KeyExtent,Location>> iterator() {
       try {
         Scanner scanner = new IsolatedScanner(
-            context.getConnector().createScanner(MetadataTable.NAME, Authorizations.EMPTY));
+            context.getClient().createScanner(MetadataTable.NAME, Authorizations.EMPTY));
         scanner.fetchColumnFamily(MetadataSchema.TabletsSection.CurrentLocationColumnFamily.NAME);
         MetadataSchema.TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
         scanner.setRange(MetadataSchema.TabletsSection.getRange(tableId));
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
index fc7e67d..ea7f3e8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
@@ -139,7 +139,7 @@ public class TableLoadBalancer extends TabletBalancer {
   protected TableOperations getTableOperations() {
     if (tops == null)
       try {
-        tops = this.context.getConnector().tableOperations();
+        tops = this.context.getClient().tableOperations();
       } catch (AccumuloException | AccumuloSecurityException e) {
         log.error("Unable to access table operations from within table balancer", e);
       }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
index de9170d..2a1f3a8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
@@ -90,7 +90,7 @@ public class MetaDataStateStore extends TabletStateStore {
 
   BatchWriter createBatchWriter() {
     try {
-      return context.getConnector().createBatchWriter(targetTableName,
+      return context.getClient().createBatchWriter(targetTableName,
           new BatchWriterConfig().setMaxMemory(MAX_MEMORY)
               .setMaxLatency(LATENCY, TimeUnit.MILLISECONDS).setMaxWriteThreads(THREADS));
     } catch (Exception e) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
index 39cdeba..6d00ce5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
@@ -60,7 +60,7 @@ public class MetaDataTableScanner implements ClosableIterator<TabletLocationStat
     // scan over metadata table, looking for tablets in the wrong state based on the live servers
     // and online tables
     try {
-      AccumuloClient accumuloClient = context.getConnector();
+      AccumuloClient accumuloClient = context.getClient();
       mdScanner = accumuloClient.createBatchScanner(tableName, Authorizations.EMPTY, 8);
       configureScanner(mdScanner, state);
       mdScanner.setRanges(Collections.singletonList(range));
diff --git a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
index 6c5ce85..f298ae7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
@@ -168,7 +168,7 @@ public class ProblemReports implements Iterable<ProblemReport> {
       return;
     }
 
-    AccumuloClient accumuloClient = context.getConnector();
+    AccumuloClient accumuloClient = context.getClient();
     Scanner scanner = accumuloClient.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
     scanner.addScanIterator(new IteratorSetting(1, "keys-only", SortedKeyIterator.class));
 
@@ -223,7 +223,7 @@ public class ProblemReports implements Iterable<ProblemReport> {
           if (iter2 == null) {
             try {
               if ((table == null || !isMeta(table)) && iter1Count == 0) {
-                AccumuloClient accumuloClient = context.getConnector();
+                AccumuloClient accumuloClient = context.getClient();
                 Scanner scanner = accumuloClient.createScanner(MetadataTable.NAME,
                     Authorizations.EMPTY);
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java
index 404720b..7ad7987 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystemHelper.java
@@ -56,7 +56,7 @@ public class ReplicaSystemHelper {
    */
   public void recordNewStatus(Path filePath, Status status, ReplicationTarget target)
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    try (BatchWriter bw = context.getConnector().createBatchWriter(ReplicationTable.NAME,
+    try (BatchWriter bw = context.getClient().createBatchWriter(ReplicationTable.NAME,
         new BatchWriterConfig())) {
       log.debug("Recording new status for {}, {}", filePath, ProtobufUtil.toString(status));
       Mutation m = new Mutation(filePath.toString());
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
index 1271a4c..8bf3399 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
@@ -163,8 +163,7 @@ public class ReplicationUtil {
     // Read over the queued work
     BatchScanner bs;
     try {
-      bs = context.getConnector().createBatchScanner(ReplicationTable.NAME, Authorizations.EMPTY,
-          4);
+      bs = context.getClient().createBatchScanner(ReplicationTable.NAME, Authorizations.EMPTY, 4);
     } catch (TableNotFoundException | AccumuloException | AccumuloSecurityException e) {
       log.debug("No replication table exists", e);
       return counts;
@@ -201,8 +200,7 @@ public class ReplicationUtil {
     // Read over the queued work
     BatchScanner bs;
     try {
-      bs = context.getConnector().createBatchScanner(ReplicationTable.NAME, Authorizations.EMPTY,
-          4);
+      bs = context.getClient().createBatchScanner(ReplicationTable.NAME, Authorizations.EMPTY, 4);
     } catch (TableNotFoundException | AccumuloException | AccumuloSecurityException e) {
       log.debug("No replication table exists", e);
       return paths;
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 c9ee53d..feb9f5c 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
@@ -244,7 +244,7 @@ public class Admin implements KeywordExecutable {
       } else if (cl.getParsedCommand().equals("volumes")) {
         ListVolumesUsed.listVolumes(context);
       } else if (cl.getParsedCommand().equals("randomizeVolumes")) {
-        rc = RandomizeVolumes.randomize(context, context.getConnector(),
+        rc = RandomizeVolumes.randomize(context, context.getClient(),
             randomizeVolumesOpts.tableName);
       } else {
         everything = cl.getParsedCommand().equals("stopAll");
@@ -272,7 +272,7 @@ public class Admin implements KeywordExecutable {
   private static int ping(ClientContext context, List<String> args)
       throws AccumuloException, AccumuloSecurityException {
 
-    InstanceOperations io = context.getConnector().instanceOperations();
+    InstanceOperations io = context.getClient().instanceOperations();
 
     if (args.size() == 0) {
       args = io.getTabletServers();
@@ -309,7 +309,7 @@ public class Admin implements KeywordExecutable {
       @Override
       public void run() {
         try {
-          AccumuloClient conn = context.getConnector();
+          AccumuloClient conn = context.getClient();
           Set<String> tables = conn.tableOperations().tableIdMap().keySet();
           for (String table : tables) {
             if (table.equals(MetadataTable.NAME))
@@ -447,7 +447,7 @@ public class Admin implements KeywordExecutable {
         throw new IllegalArgumentException(opts.directory + " is not writable");
       }
     }
-    AccumuloClient accumuloClient = context.getConnector();
+    AccumuloClient accumuloClient = context.getClient();
     defaultConfig = DefaultConfiguration.getInstance();
     siteConfig = accumuloClient.instanceOperations().getSiteConfiguration();
     systemConfig = accumuloClient.instanceOperations().getSystemConfiguration();
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
index 1ea4c2c..58e0b23 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
@@ -99,7 +99,7 @@ public class CheckForMetadataProblems {
 
     Scanner scanner;
 
-    scanner = opts.getConnector().createScanner(tableNameToCheck, Authorizations.EMPTY);
+    scanner = opts.getClient().createScanner(tableNameToCheck, Authorizations.EMPTY);
 
     scanner.setRange(MetadataSchema.TabletsSection.getRange());
     TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java b/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java
index 56abd48..5df7b2d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ListVolumesUsed.java
@@ -78,7 +78,7 @@ public class ListVolumesUsed {
 
     System.out.println("Listing volumes referenced in " + name + " tablets section");
 
-    Scanner scanner = context.getConnector().createScanner(name, Authorizations.EMPTY);
+    Scanner scanner = context.getClient().createScanner(name, Authorizations.EMPTY);
 
     scanner.setRange(MetadataSchema.TabletsSection.getRange());
     scanner.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java b/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
index 03ade88..1ff1256 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
@@ -45,7 +45,7 @@ public class LocalityCheck {
     opts.parseArgs(LocalityCheck.class.getName(), args);
 
     VolumeManager fs = opts.getServerContext().getVolumeManager();
-    AccumuloClient accumuloClient = opts.getConnector();
+    AccumuloClient accumuloClient = opts.getClient();
     Scanner scanner = accumuloClient.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
     scanner.fetchColumnFamily(TabletsSection.CurrentLocationColumnFamily.NAME);
     scanner.fetchColumnFamily(DataFileColumnFamily.NAME);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 63c0b0b..cc404ca 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -650,7 +650,7 @@ public class MetadataTableUtil {
       rootTableEntries = getLogEntries(context, new KeyExtent(MetadataTable.ID, null, null))
           .iterator();
       try {
-        Scanner scanner = context.getConnector().createScanner(MetadataTable.NAME,
+        Scanner scanner = context.getClient().createScanner(MetadataTable.NAME,
             Authorizations.EMPTY);
         log.info("Setting range to {}", MetadataSchema.TabletsSection.getRange());
         scanner.setRange(MetadataSchema.TabletsSection.getRange());
@@ -882,7 +882,7 @@ public class MetadataTableUtil {
   public static void cloneTable(ServerContext context, Table.ID srcTableId, Table.ID tableId,
       VolumeManager volumeManager) throws Exception {
 
-    AccumuloClient conn = context.getConnector();
+    AccumuloClient conn = context.getClient();
     try (BatchWriter bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig())) {
 
       while (true) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java b/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java
index a1e8847..4c333d7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java
@@ -100,7 +100,7 @@ public class RandomWriter {
     long start = System.currentTimeMillis();
     log.info("starting at {} for user {}", start, opts.getPrincipal());
     try {
-      AccumuloClient accumuloClient = opts.getConnector();
+      AccumuloClient accumuloClient = opts.getClient();
       BatchWriter bw = accumuloClient.createBatchWriter(opts.getTableName(),
           bwOpts.getBatchWriterConfig());
       log.info("Writing {} mutations...", opts.count);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java b/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java
index 7978252..d5d2326 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java
@@ -56,9 +56,9 @@ public class RandomizeVolumes {
     ServerContext context = opts.getServerContext();
     AccumuloClient c;
     if (opts.getToken() == null) {
-      c = context.getConnector();
+      c = context.getClient();
     } else {
-      c = opts.getConnector();
+      c = opts.getClient();
     }
     try {
       int status = randomize(context, c, opts.getTableName());
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java b/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
index 164fcea..2b7d114 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
@@ -128,7 +128,7 @@ public class RemoveEntriesForMissingFiles {
     System.out.printf("Scanning : %s %s\n", tableName, range);
 
     VolumeManager fs = context.getVolumeManager();
-    AccumuloClient accumuloClient = context.getConnector();
+    AccumuloClient accumuloClient = context.getClient();
     Scanner metadata = accumuloClient.createScanner(tableName, Authorizations.EMPTY);
     metadata.setRange(range);
     metadata.fetchColumnFamily(DataFileColumnFamily.NAME);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
index 8a3313c..930083e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
@@ -86,7 +86,7 @@ public class ReplicationTableUtil {
     if (replicationTable == null) {
       AccumuloClient conn;
       try {
-        conn = context.getConnector();
+        conn = context.getClient();
       } catch (AccumuloException | AccumuloSecurityException e) {
         throw new RuntimeException(e);
       }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
index d7aea77..e538e25 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
@@ -299,7 +299,7 @@ public class TableDiskUsage {
   public static void main(String[] args) throws Exception {
     Opts opts = new Opts();
     opts.parseArgs(TableDiskUsage.class.getName(), args);
-    AccumuloClient conn = opts.getConnector();
+    AccumuloClient conn = opts.getClient();
     VolumeManager fs = opts.getServerContext().getVolumeManager();
     org.apache.accumulo.server.util.TableDiskUsage.printDiskUsage(opts.tables, fs, conn, false);
   }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
index 3aa3a78..8fbe610 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
@@ -73,7 +73,7 @@ public class VerifyTabletAssignments {
     Opts opts = new Opts();
     opts.parseArgs(VerifyTabletAssignments.class.getName(), args);
 
-    AccumuloClient conn = opts.getConnector();
+    AccumuloClient conn = opts.getClient();
     ClientContext context = new ClientContext(conn.info());
     for (String table : conn.tableOperations().list())
       checkTable(context, opts, table, null);
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index 1b856d9..650f24c 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -352,7 +352,7 @@ public class GarbageCollectWriteAheadLogs {
       throws IOException, KeeperException, InterruptedException {
     AccumuloClient conn;
     try {
-      conn = context.getConnector();
+      conn = context.getClient();
       try {
         final Scanner s = ReplicationTable.getScanner(conn);
         StatusSection.limit(s);
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 56fddfb..52b7b13 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -174,8 +174,8 @@ public class SimpleGarbageCollector implements Iface {
     return context.getConfiguration();
   }
 
-  AccumuloClient getConnector() throws AccumuloSecurityException, AccumuloException {
-    return context.getConnector();
+  AccumuloClient getClient() throws AccumuloSecurityException, AccumuloException {
+    return context.getClient();
   }
 
   /**
@@ -242,7 +242,7 @@ public class SimpleGarbageCollector implements Iface {
             range.getEndKey(), range.isEndKeyInclusive());
       }
 
-      Scanner scanner = getConnector().createScanner(tableName, Authorizations.EMPTY);
+      Scanner scanner = getClient().createScanner(tableName, Authorizations.EMPTY);
       scanner.setRange(range);
       result.clear();
       // find candidates for deletion; chop off the prefix
@@ -265,7 +265,7 @@ public class SimpleGarbageCollector implements Iface {
         throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
       @SuppressWarnings("resource")
       IsolatedScanner scanner = new IsolatedScanner(
-          getConnector().createScanner(tableName, Authorizations.EMPTY));
+          getClient().createScanner(tableName, Authorizations.EMPTY));
 
       scanner.setRange(MetadataSchema.BlipSection.getRange());
 
@@ -277,7 +277,7 @@ public class SimpleGarbageCollector implements Iface {
     public Stream<Reference> getReferences()
         throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
 
-      Stream<TabletMetadata> tabletStream = MetadataScanner.builder().from(getConnector())
+      Stream<TabletMetadata> tabletStream = MetadataScanner.builder().from(getClient())
           .scanTable(tableName).overTabletRange().checkConsistency().fetchDir().fetchFiles()
           .fetchScans().build().stream();
 
@@ -314,7 +314,7 @@ public class SimpleGarbageCollector implements Iface {
         return;
       }
 
-      AccumuloClient c = getConnector();
+      AccumuloClient c = getClient();
       BatchWriter writer = c.createBatchWriter(tableName, new BatchWriterConfig());
 
       // when deleting a dir and all files in that dir, only need to delete the dir
@@ -482,7 +482,7 @@ public class SimpleGarbageCollector implements Iface {
     @Override
     public Iterator<Entry<String,Status>> getReplicationNeededIterator()
         throws AccumuloException, AccumuloSecurityException {
-      AccumuloClient conn = getConnector();
+      AccumuloClient conn = getClient();
       try {
         Scanner s = ReplicationTable.getScanner(conn);
         StatusSection.limit(s);
@@ -588,7 +588,7 @@ public class SimpleGarbageCollector implements Iface {
 
       // we just made a lot of metadata changes: flush them out
       try {
-        AccumuloClient accumuloClient = getConnector();
+        AccumuloClient accumuloClient = getClient();
         accumuloClient.tableOperations().compact(MetadataTable.NAME, null, null, true, true);
         accumuloClient.tableOperations().compact(RootTable.NAME, null, null, true, true);
       } catch (Exception e) {
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
index e1b0c56..86c78a9 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
@@ -88,7 +88,7 @@ public class CloseWriteAheadLogReferences implements Runnable {
 
     AccumuloClient conn;
     try {
-      conn = context.getConnector();
+      conn = context.getClient();
     } catch (Exception e) {
       log.error("Could not create connector", e);
       throw new RuntimeException(e);
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
index 1b59e87..39b3ccf 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
@@ -160,7 +160,7 @@ public class GarbageCollectWriteAheadLogsTest {
     EasyMock.expect(tserverSet.getCurrentServers()).andReturn(Collections.singleton(server1));
     EasyMock.expect(marker.getAllMarkers()).andReturn(markers2).once();
     EasyMock.expect(marker.state(server2, id)).andReturn(new Pair<>(WalState.OPEN, path));
-    EasyMock.expect(context.getConnector()).andReturn(conn);
+    EasyMock.expect(context.getClient()).andReturn(conn);
 
     EasyMock.expect(conn.createScanner(ReplicationTable.NAME, Authorizations.EMPTY))
         .andReturn(rscanner);
@@ -206,7 +206,7 @@ public class GarbageCollectWriteAheadLogsTest {
     EasyMock.expect(tserverSet.getCurrentServers()).andReturn(Collections.singleton(server1));
     EasyMock.expect(marker.getAllMarkers()).andReturn(markers2).once();
     EasyMock.expect(marker.state(server2, id)).andReturn(new Pair<>(WalState.OPEN, path));
-    EasyMock.expect(context.getConnector()).andReturn(conn);
+    EasyMock.expect(context.getClient()).andReturn(conn);
 
     EasyMock.expect(conn.createScanner(ReplicationTable.NAME, Authorizations.EMPTY))
         .andReturn(rscanner);
@@ -253,7 +253,7 @@ public class GarbageCollectWriteAheadLogsTest {
     EasyMock.expect(tserverSet.getCurrentServers()).andReturn(Collections.singleton(server1));
     EasyMock.expect(marker.getAllMarkers()).andReturn(markers).once();
     EasyMock.expect(marker.state(server1, id)).andReturn(new Pair<>(WalState.UNREFERENCED, path));
-    EasyMock.expect(context.getConnector()).andReturn(conn);
+    EasyMock.expect(context.getClient()).andReturn(conn);
 
     EasyMock.expect(conn.createScanner(ReplicationTable.NAME, Authorizations.EMPTY))
         .andReturn(rscanner);
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 277dd5a..fd66f2a 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -638,8 +638,8 @@ public class Master
     return context.getTableManager();
   }
 
-  public AccumuloClient getConnector() throws AccumuloSecurityException, AccumuloException {
-    return context.getConnector();
+  public AccumuloClient getClient() throws AccumuloSecurityException, AccumuloException {
+    return context.getClient();
   }
 
   public Master(ServerContext context) throws IOException {
@@ -928,7 +928,7 @@ public class Master
         if (!migrations.isEmpty()) {
           try {
             cleanupOfflineMigrations();
-            cleanupNonexistentMigrations(context.getConnector());
+            cleanupNonexistentMigrations(context.getClient());
           } catch (Exception ex) {
             log.error("Error cleaning up migrations", ex);
           }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
index cc14c66..4c61fee 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
@@ -182,7 +182,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
       serversToFlush.clear();
 
       try {
-        AccumuloClient conn = master.getConnector();
+        AccumuloClient conn = master.getClient();
         Scanner scanner;
         if (tableId.equals(MetadataTable.ID)) {
           scanner = new IsolatedScanner(conn.createScanner(RootTable.NAME, Authorizations.EMPTY));
@@ -554,7 +554,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
       Set<String> logsToWatch) throws TException {
     AccumuloClient conn;
     try {
-      conn = master.getConnector();
+      conn = master.getClient();
     } catch (AccumuloException | AccumuloSecurityException e) {
       throw new RuntimeException("Failed to obtain connector", e);
     }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
index 71a741a..ad4c8f6 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
@@ -431,7 +431,7 @@ abstract class TabletGroupWatcher extends Daemon {
       String table = MetadataTable.NAME;
       if (extent.isMeta())
         table = RootTable.NAME;
-      Scanner scanner = this.master.getConnector().createScanner(table, Authorizations.EMPTY);
+      Scanner scanner = this.master.getClient().createScanner(table, Authorizations.EMPTY);
       scanner.fetchColumnFamily(CurrentLocationColumnFamily.NAME);
       scanner.fetchColumnFamily(FutureLocationColumnFamily.NAME);
       scanner.setRange(new Range(row));
@@ -460,7 +460,7 @@ abstract class TabletGroupWatcher extends Daemon {
         TServerInstance alive = master.tserverSet.find(entry.getValue().toString());
         if (alive == null) {
           Master.log.info("Removing entry  {}", entry);
-          BatchWriter bw = this.master.getConnector().createBatchWriter(table,
+          BatchWriter bw = this.master.getClient().createBatchWriter(table,
               new BatchWriterConfig());
           Mutation m = new Mutation(entry.getKey().getRow());
           m.putDelete(entry.getKey().getColumnFamily(), entry.getKey().getColumnQualifier());
@@ -555,7 +555,7 @@ abstract class TabletGroupWatcher extends Daemon {
   private void updateMergeState(Map<Table.ID,MergeStats> mergeStatsCache) {
     for (MergeStats stats : mergeStatsCache.values()) {
       try {
-        MergeState update = stats.nextMergeState(this.master.getConnector(), this.master);
+        MergeState update = stats.nextMergeState(this.master.getClient(), this.master);
         // when next state is MERGING, its important to persist this before
         // starting the merge... the verification check that is done before
         // moving into the merging state could fail if merge starts but does
@@ -598,7 +598,7 @@ abstract class TabletGroupWatcher extends Daemon {
       Master.log.debug("Found following tablet {}", followingTablet);
     }
     try {
-      AccumuloClient conn = this.master.getConnector();
+      AccumuloClient conn = this.master.getClient();
       Text start = extent.getPrevEndRow();
       if (start == null) {
         start = new Text();
@@ -704,7 +704,7 @@ abstract class TabletGroupWatcher extends Daemon {
     BatchWriter bw = null;
     try {
       long fileCount = 0;
-      AccumuloClient conn = this.master.getConnector();
+      AccumuloClient conn = this.master.getClient();
       // Make file entries in highest tablet
       bw = conn.createBatchWriter(targetSystemTable, new BatchWriterConfig());
       Scanner scanner = conn.createScanner(targetSystemTable, Authorizations.EMPTY);
@@ -820,7 +820,7 @@ abstract class TabletGroupWatcher extends Daemon {
 
   private KeyExtent getHighTablet(KeyExtent range) throws AccumuloException {
     try {
-      AccumuloClient conn = this.master.getConnector();
+      AccumuloClient conn = this.master.getClient();
       Scanner scanner = conn.createScanner(range.isMeta() ? RootTable.NAME : MetadataTable.NAME,
           Authorizations.EMPTY);
       TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java b/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java
index bafc986..fbba53e 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java
@@ -70,7 +70,7 @@ public abstract class DistributedWorkQueueWorkAssigner implements WorkAssigner {
   /*
    * Getters/setters for testing purposes
    */
-  protected AccumuloClient getConnector() {
+  protected AccumuloClient getClient() {
     return conn;
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java b/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java
index 2261d83..e080708 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java
@@ -65,7 +65,7 @@ public class ReplicationDriver extends Daemon {
     while (master.stillMaster()) {
       if (null == workMaker) {
         try {
-          conn = master.getConnector();
+          conn = master.getClient();
         } catch (AccumuloException | AccumuloSecurityException e) {
           // couldn't get a connector, try again in a "short" amount of time
           log.warn("Error trying to get connector to process replication records", e);
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java
index 884877b..79c36f6 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java
@@ -47,7 +47,7 @@ public class WorkDriver extends Daemon {
   public WorkDriver(Master master) throws AccumuloException, AccumuloSecurityException {
     super();
     this.master = master;
-    this.conn = master.getConnector();
+    this.conn = master.getClient();
     this.conf = master.getConfiguration();
     configureWorkAssigner();
   }
@@ -76,7 +76,7 @@ public class WorkDriver extends Daemon {
   /*
    * Getters/setters for testing purposes
    */
-  protected AccumuloClient getConnector() {
+  protected AccumuloClient getClient() {
     return conn;
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java b/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
index 0fd2bbb..ae79a93 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
@@ -261,7 +261,7 @@ public class MergeStats {
     ClientOpts opts = new ClientOpts();
     opts.parseArgs(MergeStats.class.getName(), args);
 
-    AccumuloClient conn = opts.getConnector();
+    AccumuloClient conn = opts.getClient();
     Map<String,String> tableIdMap = conn.tableOperations().tableIdMap();
     ZooReaderWriter zooReaderWriter = opts.getServerContext().getZooReaderWriter();
     for (Entry<String,String> entry : tableIdMap.entrySet()) {
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java
index 3d2ebb4..91c0348 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java
@@ -90,7 +90,7 @@ class CleanUp extends MasterRepo {
 
     boolean done = true;
     Range tableRange = new KeyExtent(tableId, null, null).toMetadataRange();
-    Scanner scanner = master.getConnector().createScanner(MetadataTable.NAME, Authorizations.EMPTY);
+    Scanner scanner = master.getClient().createScanner(MetadataTable.NAME, Authorizations.EMPTY);
     MetaDataTableScanner.configureScanner(scanner, master);
     scanner.setRange(tableRange);
 
@@ -121,7 +121,7 @@ class CleanUp extends MasterRepo {
 
     try {
       // look for other tables that references this table's files
-      AccumuloClient conn = master.getConnector();
+      AccumuloClient conn = master.getClient();
       try (BatchScanner bs = conn.createBatchScanner(MetadataTable.NAME, Authorizations.EMPTY, 8)) {
         Range allTables = MetadataSchema.TabletsSection.getRange();
         Range tableRange = MetadataSchema.TabletsSection.getRange(tableId);
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
index 79d3972..62679d5 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
@@ -85,7 +85,7 @@ class CompactionDriver extends MasterRepo {
     }
 
     MapCounter<TServerInstance> serversToFlush = new MapCounter<>();
-    AccumuloClient conn = master.getConnector();
+    AccumuloClient conn = master.getClient();
 
     Scanner scanner;
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java
index eb1c7eb..db07dd0 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java
@@ -66,7 +66,7 @@ class PopulateMetadata extends MasterRepo {
       SortedSet<Text> dirs = Utils
           .getSortedSetFromFile(environment.getInputStream(tableInfo.splitDirsFile), false);
       Map<Text,Text> splitDirMap = createSplitDirectoryMap(splits, dirs);
-      try (BatchWriter bw = environment.getConnector().createBatchWriter("accumulo.metadata")) {
+      try (BatchWriter bw = environment.getClient().createBatchWriter("accumulo.metadata")) {
         writeSplitsToMetadataTable(environment.getContext(), tableInfo.tableId, splits, splitDirMap,
             tableInfo.timeType, environment.getMasterLock(), bw);
       }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
index 4db3072..13de036 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
@@ -93,7 +93,7 @@ class PopulateMetadataTable extends MasterRepo {
     try {
       VolumeManager fs = master.getFileSystem();
 
-      mbw = master.getConnector().createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
+      mbw = master.getClient().createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
 
       zis = new ZipInputStream(fs.open(path));
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
index dfad6fb..aef42cf 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
@@ -90,7 +90,7 @@ class WriteExportFiles extends MasterRepo {
     if (reserved > 0)
       return reserved;
 
-    AccumuloClient conn = master.getConnector();
+    AccumuloClient conn = master.getClient();
 
     checkOffline(master.getContext());
 
@@ -216,7 +216,7 @@ class WriteExportFiles extends MasterRepo {
 
     Map<String,String> uniqueFiles = new HashMap<>();
 
-    Scanner metaScanner = context.getConnector().createScanner(MetadataTable.NAME,
+    Scanner metaScanner = context.getClient().createScanner(MetadataTable.NAME,
         Authorizations.EMPTY);
     metaScanner.fetchColumnFamily(DataFileColumnFamily.NAME);
     TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(metaScanner);
@@ -254,7 +254,7 @@ class WriteExportFiles extends MasterRepo {
   private static void exportConfig(ServerContext context, Table.ID tableID, ZipOutputStream zipOut,
       DataOutputStream dataOut)
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException, IOException {
-    AccumuloClient conn = context.getConnector();
+    AccumuloClient conn = context.getClient();
 
     DefaultConfiguration defaultConfig = DefaultConfiguration.getInstance();
     Map<String,String> siteConfig = conn.instanceOperations().getSiteConfiguration();
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CleanUpBulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CleanUpBulkImport.java
index 18470e4..9c04556 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CleanUpBulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CleanUpBulkImport.java
@@ -57,7 +57,7 @@ public class CleanUpBulkImport extends MasterRepo {
         "/" + bulkDir.getParent().getName() + "/" + bulkDir.getName());
     MetadataTableUtil.addDeleteEntry(master.getContext(), tableId, bulkDir.toString());
     log.debug("removing the metadata table markers for loaded files");
-    AccumuloClient conn = master.getConnector();
+    AccumuloClient conn = master.getClient();
     MetadataTableUtil.removeBulkLoadEntries(conn, tableId, tid);
     log.debug("releasing HDFS reservations for " + source + " and " + error);
     Utils.unreserveHdfsDirectory(master, source, tid);
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java
index 1ce2cfd..c2cee48 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java
@@ -114,7 +114,7 @@ class CopyFailed extends MasterRepo {
      */
 
     // determine which failed files were loaded
-    AccumuloClient conn = master.getConnector();
+    AccumuloClient conn = master.getClient();
     try (Scanner mscanner = new IsolatedScanner(
         conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY))) {
       mscanner.setRange(new KeyExtent(tableId, null, null).toMetadataRange());
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/CleanUpBulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/CleanUpBulkImport.java
index 66caae4..c063b80 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/CleanUpBulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/CleanUpBulkImport.java
@@ -52,7 +52,7 @@ public class CleanUpBulkImport extends MasterRepo {
     MetadataTableUtil.addDeleteEntry(master.getContext(), info.tableId, bulkDir.toString());
     if (info.tableState == TableState.ONLINE) {
       log.debug("removing the metadata table markers for loaded files");
-      AccumuloClient conn = master.getConnector();
+      AccumuloClient conn = master.getClient();
       MetadataTableUtil.removeBulkLoadEntries(conn, info.tableId, tid);
     }
     Utils.unreserveHdfsDirectory(master, info.sourceDir, tid);
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java
index f965e56..087ae3b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java
@@ -216,7 +216,7 @@ class LoadFiles extends MasterRepo {
     void start(Path bulkDir, Master master, long tid, boolean setTime) throws Exception {
       Preconditions.checkArgument(!setTime);
       super.start(bulkDir, master, tid, setTime);
-      bw = master.getConnector().createBatchWriter(MetadataTable.NAME);
+      bw = master.getClient().createBatchWriter(MetadataTable.NAME);
       unloadingTablets = new MapCounter<>();
     }
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 8ddeb01..1a5843e 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -595,7 +595,7 @@ public class Monitor implements HighlyAvailableService {
   public static void fetchScans() throws Exception {
     if (context == null)
       return;
-    AccumuloClient c = context.getConnector();
+    AccumuloClient c = context.getClient();
     for (String server : c.instanceOperations().getTabletServers()) {
       final HostAndPort parsedServer = HostAndPort.fromString(server);
       Client tserver = ThriftUtil.getTServerClient(parsedServer, context);
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
index 73d0324..afa82f8 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
@@ -74,7 +74,7 @@ public class ReplicationResource {
   @GET
   public List<ReplicationInformation> getReplicationInformation()
       throws AccumuloException, AccumuloSecurityException {
-    final AccumuloClient conn = Monitor.getContext().getConnector();
+    final AccumuloClient conn = Monitor.getContext().getClient();
 
     final TableOperations tops = conn.tableOperations();
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java
index a009d18..31a0d6f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java
@@ -358,7 +358,7 @@ public class TracesResource {
   private Scanner getScanner(String table, String principal, AuthenticationToken at)
       throws AccumuloException, AccumuloSecurityException {
     try {
-      AccumuloClient conn = Monitor.getContext().getConnector(principal, at);
+      AccumuloClient conn = Monitor.getContext().getClient(principal, at);
       if (!conn.tableOperations().exists(table)) {
         return null;
       }
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
index 61b4064..83f41bb 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
@@ -82,7 +82,7 @@ public class TraceDump {
     PrintStream out = System.out;
     long endTime = System.currentTimeMillis();
     long startTime = endTime - opts.length;
-    AccumuloClient conn = opts.getConnector();
+    AccumuloClient conn = opts.getClient();
     Scanner scanner = conn.createScanner(opts.getTableName(), opts.auths);
     scanner.setBatchSize(scanOpts.scanBatchSize);
     Range range = new Range(new Text("start:" + Long.toHexString(startTime)),
@@ -104,7 +104,7 @@ public class TraceDump {
 
   private static int dumpTrace(Opts opts, ScannerOpts scanOpts) throws Exception {
     final PrintStream out = System.out;
-    AccumuloClient conn = opts.getConnector();
+    AccumuloClient conn = opts.getClient();
 
     int count = 0;
     for (String traceId : opts.traceIds) {
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java
index fd8766c..5ae99d4 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java
@@ -74,7 +74,7 @@ public class TraceTableStats {
 
   public void count(Opts opts)
       throws AccumuloSecurityException, AccumuloException, TableNotFoundException {
-    AccumuloClient conn = opts.getConnector();
+    AccumuloClient conn = opts.getClient();
     Scanner scanner = conn.createScanner(opts.getTableName(), Authorizations.EMPTY);
     scanner.setRange(new Range(null, true, "idx:", false));
     Map<String,SpanTypeCount> counts = new TreeMap<>();
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java
index 48575d0..7c50bd7 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java
@@ -83,7 +83,7 @@ public class BatchWriterReplicationReplayer implements AccumuloReplicationReplay
           BatchWriterConfig bwConfig = new BatchWriterConfig();
           bwConfig.setMaxMemory(memoryInBytes);
           try {
-            bw = context.getConnector().createBatchWriter(tableName, bwConfig);
+            bw = context.getClient().createBatchWriter(tableName, bwConfig);
           } catch (TableNotFoundException e) {
             throw new RemoteReplicationException(RemoteReplicationErrorCode.TABLE_DOES_NOT_EXIST,
                 "Table " + tableName + " does not exist");
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java
index 35fdbe7..10635d3 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java
@@ -180,7 +180,7 @@ public class ReplicationProcessor implements Processor {
   protected Status getStatus(String file, ReplicationTarget target)
       throws ReplicationTableOfflineException, AccumuloException, AccumuloSecurityException,
       InvalidProtocolBufferException {
-    Scanner s = ReplicationTable.getScanner(context.getConnector());
+    Scanner s = ReplicationTable.getScanner(context.getClient());
     s.setRange(Range.exact(file));
     s.fetchColumn(WorkSection.NAME, target.toText());
 
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayerTest.java
index 44cd5b0..3b335a6 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayerTest.java
@@ -63,7 +63,7 @@ public class BatchWriterReplicationReplayerTest {
     bw = createMock(BatchWriter.class);
     context = createMock(ClientContext.class);
     expect(context.getConfiguration()).andReturn(conf).anyTimes();
-    expect(context.getConnector()).andReturn(conn).anyTimes();
+    expect(context.getClient()).andReturn(conn).anyTimes();
     replay(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 16ffedb..96bc364 100644
--- a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
+++ b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
@@ -359,7 +359,7 @@ public abstract class AccumuloClusterHarness extends AccumuloITBase
     }
   }
 
-  public Connector getConnector() {
+  public Connector getClient() {
     try {
       log.warn("No longer used since version 2.0, please call getAccumuloClient() instead.");
       String princ = getAdminPrincipal();
diff --git a/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java b/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
index 465eee0..4b5567c 100644
--- a/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
+++ b/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
@@ -100,7 +100,7 @@ public class QueryMetadataTable {
     ScannerOpts scanOpts = new ScannerOpts();
     opts.parseArgs(QueryMetadataTable.class.getName(), args, scanOpts);
 
-    AccumuloClient accumuloClient = opts.getConnector();
+    AccumuloClient accumuloClient = opts.getClient();
     HashSet<Text> rowSet = new HashSet<>();
 
     int count = 0;
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 b7dbc96..e0689fe 100644
--- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
@@ -56,9 +56,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.accumulo.core.Accumulo;
 import org.apache.accumulo.core.Constants;
+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.AccumuloClient;
 import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.Scanner;
@@ -2333,7 +2333,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2355,7 +2355,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2377,7 +2377,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2399,7 +2399,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2421,7 +2421,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2443,7 +2443,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2465,7 +2465,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2487,7 +2487,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, false);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2521,7 +2521,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
     ts.exec("table " + tableName1, true);
     String tablesOutput = ts.exec("tables", true);
     assertTrue(tablesOutput.contains(tableName2));
-    Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName2);
+    Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName2);
     assertEquals(new TreeSet<>(splits), new TreeSet<>(createdSplits));
     ts.exec("deletetable -f " + tableName1, true);
     ts.exec("deletetable -f " + tableName2, true);
@@ -2542,7 +2542,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2564,7 +2564,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2586,7 +2586,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2608,7 +2608,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2630,7 +2630,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2652,7 +2652,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
@@ -2674,7 +2674,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
       SortedSet<Text> expectedSplits = readSplitsFromFile(splitsFile, false);
       final String tableName = name.getMethodName() + "_table";
       ts.exec("createtable " + tableName + " -sf " + splitsFile, true);
-      Collection<Text> createdSplits = getConnector().tableOperations().listSplits(tableName);
+      Collection<Text> createdSplits = getClient().tableOperations().listSplits(tableName);
       assertEquals(expectedSplits, new TreeSet<>(createdSplits));
     } finally {
       Files.delete(Paths.get(splitsFile));
diff --git a/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java b/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
index 3c637f4..22652e1 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
@@ -237,7 +237,7 @@ public class TestBinaryRows {
     opts.parseArgs(TestBinaryRows.class.getName(), args, scanOpts, bwOpts);
 
     try {
-      runTest(opts.getConnector(), opts, bwOpts, scanOpts);
+      runTest(opts.getClient(), opts, bwOpts, scanOpts);
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
diff --git a/test/src/main/java/org/apache/accumulo/test/TestIngest.java b/test/src/main/java/org/apache/accumulo/test/TestIngest.java
index 7938af6..65caee9 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestIngest.java
@@ -197,7 +197,7 @@ public class TestIngest {
 
       // test batch update
 
-      ingest(opts.getConnector(), opts, bwOpts);
+      ingest(opts.getClient(), opts, bwOpts);
     } catch (Exception e) {
       throw new RuntimeException(e);
     } finally {
diff --git a/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java b/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
index 7dd2a64..59564f8 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
@@ -84,7 +84,7 @@ public class TestMultiTableIngest {
     // create the test table within accumulo
     AccumuloClient accumuloClient;
     try {
-      accumuloClient = opts.getConnector();
+      accumuloClient = opts.getClient();
     } catch (AccumuloException | AccumuloSecurityException e) {
       throw new RuntimeException(e);
     }
diff --git a/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java b/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
index bdebd11..d26f8a4 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
@@ -82,7 +82,7 @@ public class TestRandomDeletes {
   private static TreeSet<RowColumn> scanAll(ClientOnDefaultTable opts, ScannerOpts scanOpts,
       String tableName) throws Exception {
     TreeSet<RowColumn> result = new TreeSet<>();
-    AccumuloClient conn = opts.getConnector();
+    AccumuloClient conn = opts.getClient();
     try (Scanner scanner = conn.createScanner(tableName, auths)) {
       scanner.setBatchSize(scanOpts.scanBatchSize);
       for (Entry<Key,Value> entry : scanner) {
@@ -102,7 +102,7 @@ public class TestRandomDeletes {
     ArrayList<RowColumn> entries = new ArrayList<>(rows);
     java.util.Collections.shuffle(entries);
 
-    AccumuloClient accumuloClient = opts.getConnector();
+    AccumuloClient accumuloClient = opts.getClient();
     BatchWriter mutations = accumuloClient.createBatchWriter(tableName,
         bwOpts.getBatchWriterConfig());
 
diff --git a/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
index 84b8b24..c04dea0 100644
--- a/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
@@ -69,7 +69,7 @@ public class VerifyIngest {
         Trace.data("cmdLine", Arrays.asList(args).toString());
       }
 
-      verifyIngest(opts.getConnector(), opts, scanOpts);
+      verifyIngest(opts.getClient(), opts, scanOpts);
 
     } finally {
       Trace.off();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java
index 70d7c57..f631a60 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java
@@ -16,6 +16,9 @@
  */
 package org.apache.accumulo.test.functional;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Properties;
 
 import org.apache.accumulo.core.Accumulo;
@@ -24,7 +27,6 @@ import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.conf.ClientProperty;
 import org.apache.accumulo.harness.AccumuloClusterHarness;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class AccumuloClientIT extends AccumuloClusterHarness {
@@ -41,17 +43,17 @@ public class AccumuloClientIT extends AccumuloClusterHarness {
     AccumuloClient conn = Accumulo.newClient().forInstance(instanceName, zookeepers)
         .usingPassword(user, password).withZkTimeout(1234).build();
 
-    Assert.assertEquals(instanceName, conn.info().getInstanceName());
-    Assert.assertEquals(zookeepers, conn.info().getZooKeepers());
-    Assert.assertEquals(user, conn.whoami());
-    Assert.assertEquals(1234, conn.info().getZooKeepersSessionTimeOut());
+    assertEquals(instanceName, conn.info().getInstanceName());
+    assertEquals(zookeepers, conn.info().getZooKeepers());
+    assertEquals(user, conn.whoami());
+    assertEquals(1234, conn.info().getZooKeepersSessionTimeOut());
 
     ClientInfo info = Accumulo.newClient().forInstance(instanceName, zookeepers)
         .usingPassword(user, password).info();
-    Assert.assertEquals(instanceName, info.getInstanceName());
-    Assert.assertEquals(zookeepers, info.getZooKeepers());
-    Assert.assertEquals(user, info.getPrincipal());
-    Assert.assertTrue(info.getAuthenticationToken() instanceof PasswordToken);
+    assertEquals(instanceName, info.getInstanceName());
+    assertEquals(zookeepers, info.getZooKeepers());
+    assertEquals(user, info.getPrincipal());
+    assertTrue(info.getAuthenticationToken() instanceof PasswordToken);
 
     Properties props = new Properties();
     props.put(ClientProperty.INSTANCE_NAME.getKey(), instanceName);
@@ -61,10 +63,10 @@ public class AccumuloClientIT extends AccumuloClusterHarness {
     ClientProperty.setPassword(props, password);
     conn = Accumulo.newClient().usingProperties(props).build();
 
-    Assert.assertEquals(instanceName, conn.info().getInstanceName());
-    Assert.assertEquals(zookeepers, conn.info().getZooKeepers());
-    Assert.assertEquals(user, conn.whoami());
-    Assert.assertEquals(22000, conn.info().getZooKeepersSessionTimeOut());
+    assertEquals(instanceName, conn.info().getInstanceName());
+    assertEquals(zookeepers, conn.info().getZooKeepers());
+    assertEquals(user, conn.whoami());
+    assertEquals(22000, conn.info().getZooKeepersSessionTimeOut());
 
     final String user2 = "testuser2";
     final String password2 = "testpassword2";
@@ -72,25 +74,25 @@ public class AccumuloClientIT extends AccumuloClusterHarness {
 
     AccumuloClient conn2 = Accumulo.newClient().usingClientInfo(conn.info())
         .usingToken(user2, new PasswordToken(password2)).build();
-    Assert.assertEquals(instanceName, conn2.info().getInstanceName());
-    Assert.assertEquals(zookeepers, conn2.info().getZooKeepers());
-    Assert.assertEquals(user2, conn2.whoami());
+    assertEquals(instanceName, conn2.info().getInstanceName());
+    assertEquals(zookeepers, conn2.info().getZooKeepers());
+    assertEquals(user2, conn2.whoami());
     info = conn2.info();
-    Assert.assertEquals(instanceName, info.getInstanceName());
-    Assert.assertEquals(zookeepers, info.getZooKeepers());
-    Assert.assertEquals(user2, info.getPrincipal());
+    assertEquals(instanceName, info.getInstanceName());
+    assertEquals(zookeepers, info.getZooKeepers());
+    assertEquals(user2, info.getPrincipal());
 
     final String user3 = "testuser3";
     final String password3 = "testpassword3";
     c.securityOperations().createLocalUser(user3, new PasswordToken(password3));
 
     AccumuloClient conn3 = conn.changeUser(user3, new PasswordToken(password3));
-    Assert.assertEquals(instanceName, conn3.info().getInstanceName());
-    Assert.assertEquals(zookeepers, conn3.info().getZooKeepers());
-    Assert.assertEquals(user3, conn3.whoami());
+    assertEquals(instanceName, conn3.info().getInstanceName());
+    assertEquals(zookeepers, conn3.info().getZooKeepers());
+    assertEquals(user3, conn3.whoami());
     info = conn3.info();
-    Assert.assertEquals(instanceName, info.getInstanceName());
-    Assert.assertEquals(zookeepers, info.getZooKeepers());
-    Assert.assertEquals(user3, info.getPrincipal());
+    assertEquals(instanceName, info.getInstanceName());
+    assertEquals(zookeepers, info.getZooKeepers());
+    assertEquals(user3, info.getPrincipal());
   }
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CreateInitialSplitsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CreateInitialSplitsIT.java
index 856956a..4642630 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CreateInitialSplitsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CreateInitialSplitsIT.java
@@ -64,7 +64,7 @@ public class CreateInitialSplitsIT extends AccumuloClusterHarness {
 
   @Before
   public void setupInitialSplits() {
-    connector = getConnector();
+    connector = getClient();
   }
 
   /**
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
index 47528c9..0ff167a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
@@ -96,7 +96,7 @@ public class WALSunnyDayIT extends ConfigurableMacBase {
     MiniAccumuloClusterControl control = mac.getClusterControl();
     control.stop(GARBAGE_COLLECTOR);
     ServerContext context = getServerContext();
-    AccumuloClient c = context.getConnector();
+    AccumuloClient c = context.getClient();
     String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     writeSomeData(c, tableName, 1, 1);
diff --git a/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java b/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
index 2250b87..0ab3a2e 100644
--- a/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
@@ -108,7 +108,7 @@ public class MergeStateIT extends ConfigurableMacBase {
   public void test() throws Exception {
     ServerContext context = EasyMock.createMock(ServerContext.class);
     AccumuloClient accumuloClient = getClient();
-    EasyMock.expect(context.getConnector()).andReturn(accumuloClient).anyTimes();
+    EasyMock.expect(context.getClient()).andReturn(accumuloClient).anyTimes();
     EasyMock.replay(context);
     accumuloClient.securityOperations().grantTablePermission(accumuloClient.whoami(),
         MetadataTable.NAME, TablePermission.WRITE);
@@ -170,8 +170,7 @@ public class MergeStateIT extends ConfigurableMacBase {
 
     // now we should be ready to merge but, we have inconsistent metadata
     stats = scan(state, metaDataStateStore);
-    assertEquals(MergeState.WAITING_FOR_OFFLINE,
-        stats.nextMergeState(accumuloClient, state));
+    assertEquals(MergeState.WAITING_FOR_OFFLINE, stats.nextMergeState(accumuloClient, state));
 
     // finish the split
     KeyExtent tablet = new KeyExtent(tableId, new Text("p"), new Text("o"));
@@ -183,8 +182,7 @@ public class MergeStateIT extends ConfigurableMacBase {
 
     // onos... there's a new tablet online
     stats = scan(state, metaDataStateStore);
-    assertEquals(MergeState.WAITING_FOR_CHOPPED,
-        stats.nextMergeState(accumuloClient, state));
+    assertEquals(MergeState.WAITING_FOR_CHOPPED, stats.nextMergeState(accumuloClient, state));
 
     // chop it
     m = tablet.getPrevRowUpdateMutation();
@@ -192,8 +190,7 @@ public class MergeStateIT extends ConfigurableMacBase {
     update(accumuloClient, m);
 
     stats = scan(state, metaDataStateStore);
-    assertEquals(MergeState.WAITING_FOR_OFFLINE,
-        stats.nextMergeState(accumuloClient, state));
+    assertEquals(MergeState.WAITING_FOR_OFFLINE, stats.nextMergeState(accumuloClient, state));
 
     // take it offline
     m = tablet.getPrevRowUpdateMutation();
diff --git a/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java b/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
index 328b33f..9f9dae6 100644
--- a/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
@@ -168,7 +168,7 @@ public class SuspendedTabletsIT extends ConfigurableMacBase {
 
     String tableName = getUniqueNames(1)[0];
 
-    AccumuloClient conn = ctx.getConnector();
+    AccumuloClient conn = ctx.getClient();
 
     // Create a table with a bunch of splits
     log.info("Creating table " + tableName);
@@ -313,7 +313,7 @@ public class SuspendedTabletsIT extends ConfigurableMacBase {
     }
 
     private void scan(ClientContext ctx, String tableName) throws Exception {
-      Map<String,String> idMap = ctx.getConnector().tableOperations().tableIdMap();
+      Map<String,String> idMap = ctx.getClient().tableOperations().tableIdMap();
       String tableId = Objects.requireNonNull(idMap.get(tableName));
       try (MetaDataTableScanner scanner = new MetaDataTableScanner(ctx, new Range())) {
         while (scanner.hasNext()) {
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/ContinuousIngest.java b/test/src/main/java/org/apache/accumulo/test/performance/ContinuousIngest.java
index 53c4fec..4020c11 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/ContinuousIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/ContinuousIngest.java
@@ -89,7 +89,7 @@ public class ContinuousIngest {
     if (opts.min < 0 || opts.max < 0 || opts.max <= opts.min) {
       throw new IllegalArgumentException("bad min and max");
     }
-    AccumuloClient conn = clientOpts.getConnector();
+    AccumuloClient conn = clientOpts.getClient();
 
     if (!conn.tableOperations().exists(clientOpts.getTableName())) {
       throw new TableNotFoundException(null, clientOpts.getTableName(),
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
index 7e3d77a..d8be949 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
@@ -215,7 +215,7 @@ public class CollectTabletStats {
 
       ArrayList<Test> tests = new ArrayList<>();
 
-      final AccumuloClient conn = opts.getConnector();
+      final AccumuloClient conn = opts.getClient();
 
       for (final KeyExtent ke : tabletsToTest) {
         Test test = new Test(ke) {
@@ -233,7 +233,7 @@ public class CollectTabletStats {
     }
 
     for (final KeyExtent ke : tabletsToTest) {
-      final AccumuloClient conn = opts.getConnector();
+      final AccumuloClient conn = opts.getClient();
 
       threadPool.submit(new Runnable() {
         @Override
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java b/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
index 78def66..d0394a1 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
@@ -106,7 +106,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB
    */
   private Set<String> getWalsForTable(String tableName) throws Exception {
     final ServerContext context = getServerContext();
-    final AccumuloClient conn = context.getConnector();
+    final AccumuloClient conn = context.getClient();
     final String tableId = conn.tableOperations().tableIdMap().get(tableName);
 
     assertNotNull("Could not determine table ID for " + tableName, tableId);
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
index 4f5d3b9..85617cc 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@ -146,7 +146,7 @@ public class ReplicationIT extends ConfigurableMacBase {
 
   private Multimap<String,Table.ID> getLogs(ServerContext context) throws Exception {
     // Map of server to tableId
-    AccumuloClient conn = context.getConnector();
+    AccumuloClient conn = context.getClient();
     Multimap<TServerInstance,String> serverToTableID = HashMultimap.create();
     try (Scanner scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY)) {
       scanner.setRange(MetadataSchema.TabletsSection.getRange());
@@ -174,7 +174,7 @@ public class ReplicationIT extends ConfigurableMacBase {
 
   private Multimap<String,Table.ID> getAllLogs(ServerContext context) throws Exception {
     Multimap<String,Table.ID> logs = getLogs(context);
-    try (Scanner scanner = context.getConnector().createScanner(ReplicationTable.NAME,
+    try (Scanner scanner = context.getClient().createScanner(ReplicationTable.NAME,
         Authorizations.EMPTY)) {
       StatusSection.limit(scanner);
       Text buff = new Text();
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
index 16ba157..00b86eb 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
@@ -85,7 +85,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
   private ReplicationOperationsImpl getReplicationOperations() throws Exception {
     Master master = EasyMock.createMock(Master.class);
     ServerContext serverContext = EasyMock.createMock(ServerContext.class);
-    EasyMock.expect(master.getConnector()).andReturn(conn).anyTimes();
+    EasyMock.expect(master.getClient()).andReturn(conn).anyTimes();
     EasyMock.expect(master.getContext()).andReturn(serverContext).anyTimes();
     EasyMock.replay(master);
 
diff --git a/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java b/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java
index dd5cefb..fd89c9b 100644
--- a/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java
@@ -76,7 +76,7 @@ public class SystemCredentialsIT extends ConfigurableMacBase {
     }
     AccumuloClient conn;
     try {
-      conn = context.getConnector(creds.getPrincipal(), creds.getToken());
+      conn = context.getClient(creds.getPrincipal(), creds.getToken());
     } catch (AccumuloSecurityException e) {
       e.printStackTrace(System.err);
       System.exit(BAD_PASSWD_FAIL_CODE);
diff --git a/test/src/main/java/org/apache/accumulo/test/util/metadata/MetadataBatchScan.java b/test/src/main/java/org/apache/accumulo/test/util/metadata/MetadataBatchScan.java
index c46f06b..84fbd55 100644
--- a/test/src/main/java/org/apache/accumulo/test/util/metadata/MetadataBatchScan.java
+++ b/test/src/main/java/org/apache/accumulo/test/util/metadata/MetadataBatchScan.java
@@ -63,7 +63,7 @@ public class MetadataBatchScan {
 
     ClientOpts opts = new ClientOpts();
     opts.parseArgs(MetadataBatchScan.class.getName(), args);
-    final AccumuloClient accumuloClient = opts.getConnector();
+    final AccumuloClient accumuloClient = opts.getClient();
 
     TreeSet<Long> splits = new TreeSet<>();
     Random r = new SecureRandom();


Mime
View raw message