Adds AssistantManagerThriftRPCs

core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java

@@ -105,7 +105,7 @@ public void setProperty(final String property, final String value)
       log.warn("{} was deprecated and will be removed in a future release;"
           + " setting its replacement {} instead", property, replacement);
     });
-    ThriftClientTypes.MANAGER.executeVoid(context, client -> client
+    ThriftClientTypes.ASSISTANT_MANAGER.executeVoid(context, client -> client
         .setSystemProperty(TraceUtil.traceInfo(), context.rpcCreds(), property, value));
     checkLocalityGroups(property);
   }
@@ -138,7 +138,7 @@ private Map<String,String> tryToModifyProperties(final Consumer<Map<String,Strin
     }
 
     // Send to server
-    ThriftClientTypes.MANAGER.executeVoid(context, client -> client
+    ThriftClientTypes.ASSISTANT_MANAGER.executeVoid(context, client -> client
         .modifySystemProperties(TraceUtil.traceInfo(), context.rpcCreds(), vProperties));
 
     return vProperties.getProperties();
@@ -184,7 +184,7 @@ public void removeProperty(final String property)
       log.warn("{} was deprecated and will be removed in a future release; assuming user meant"
           + " its replacement {} and will remove that instead", property, replacement);
     });
-    ThriftClientTypes.MANAGER.executeVoid(context,
+    ThriftClientTypes.ASSISTANT_MANAGER.executeVoid(context,
         client -> client.removeSystemProperty(TraceUtil.traceInfo(), context.rpcCreds(), property));
     checkLocalityGroups(property);
   }

core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java

@@ -187,7 +187,7 @@ public void setProperty(final String namespace, final String property, final Str
     checkArgument(value != null, "value is null");
 
     try {
-      ThriftClientTypes.MANAGER.executeVoidTableCommand(context,
+      ThriftClientTypes.ASSISTANT_MANAGER.executeVoidTableCommand(context,
           client -> client.setNamespaceProperty(TraceUtil.traceInfo(), context.rpcCreds(),
               namespace, property, value));
     } catch (TableNotFoundException e) {
@@ -218,7 +218,7 @@ private Map<String,String> tryToModifyProperties(final String namespace,
 
     try {
       // Send to server
-      ThriftClientTypes.MANAGER.executeVoidTableCommand(context,
+      ThriftClientTypes.ASSISTANT_MANAGER.executeVoidTableCommand(context,
           client -> client.modifyNamespaceProperties(TraceUtil.traceInfo(), context.rpcCreds(),
               namespace, vProperties));
 
@@ -273,7 +273,7 @@ public void removeProperty(final String namespace, final String property)
     EXISTING_NAMESPACE_NAME.validate(namespace);
     checkArgument(property != null, "property is null");
     try {
-      ThriftClientTypes.MANAGER.executeVoidTableCommand(context, client -> client
+      ThriftClientTypes.ASSISTANT_MANAGER.executeVoidTableCommand(context, client -> client
           .removeNamespaceProperty(TraceUtil.traceInfo(), context.rpcCreds(), namespace, property));
     } catch (TableNotFoundException e) {
       if (e.getCause() instanceof NamespaceNotFoundException) {

core/src/main/java/org/apache/accumulo/core/clientImpl/ResourceGroupOperationsImpl.java

@@ -76,7 +76,7 @@ public Set<ResourceGroupId> list() {
   @Override
   public void create(ResourceGroupId group) throws AccumuloException, AccumuloSecurityException {
     checkArgument(group != null, "group argument must be supplied");
-    ThriftClientTypes.MANAGER.executeVoid(context, client -> client
+    ThriftClientTypes.ASSISTANT_MANAGER.executeVoid(context, client -> client
         .createResourceGroupNode(TraceUtil.traceInfo(), context.rpcCreds(), group.canonical()));
   }
 
@@ -116,7 +116,7 @@ public void setProperty(ResourceGroupId group, String property, String value)
           + " setting its replacement {} instead", property, replacement);
     });
     try {
-      ThriftClientTypes.MANAGER.executeVoid(context,
+      ThriftClientTypes.ASSISTANT_MANAGER.executeVoid(context,
           client -> client.setResourceGroupProperty(TraceUtil.traceInfo(), context.rpcCreds(),
               group.canonical(), property, value));
     } catch (AccumuloException | AccumuloSecurityException e) {
@@ -168,7 +168,7 @@ private Map<String,String> tryToModifyProperties(final ResourceGroupId group,
 
     // Send to server
     try {
-      ThriftClientTypes.MANAGER.executeVoid(context,
+      ThriftClientTypes.ASSISTANT_MANAGER.executeVoid(context,
           client -> client.modifyResourceGroupProperties(TraceUtil.traceInfo(), context.rpcCreds(),
               group.canonical(), vProperties));
     } catch (AccumuloException | AccumuloSecurityException e) {
@@ -228,7 +228,7 @@ public void removeProperty(ResourceGroupId group, String property)
           + " its replacement {} and will remove that instead", property, replacement);
     });
     try {
-      ThriftClientTypes.MANAGER.executeVoid(context,
+      ThriftClientTypes.ASSISTANT_MANAGER.executeVoid(context,
           client -> client.removeResourceGroupProperty(TraceUtil.traceInfo(), context.rpcCreds(),
               group.canonical(), property));
     } catch (AccumuloException | AccumuloSecurityException e) {
@@ -246,7 +246,7 @@ public void remove(ResourceGroupId group)
       throws AccumuloException, AccumuloSecurityException, ResourceGroupNotFoundException {
     checkArgument(group != null, "group argument must be supplied");
     try {
-      ThriftClientTypes.MANAGER.executeVoid(context, client -> client
+      ThriftClientTypes.ASSISTANT_MANAGER.executeVoid(context, client -> client
           .removeResourceGroupNode(TraceUtil.traceInfo(), context.rpcCreds(), group.canonical()));
     } catch (AccumuloException | AccumuloSecurityException e) {
       Throwable t = e.getCause();

core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java

@@ -137,8 +137,8 @@
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.manager.state.tables.TableState;
+import org.apache.accumulo.core.manager.thrift.AssistantManagerClientService;
 import org.apache.accumulo.core.manager.thrift.FateService;
-import org.apache.accumulo.core.manager.thrift.ManagerClientService;
 import org.apache.accumulo.core.manager.thrift.TFateId;
 import org.apache.accumulo.core.manager.thrift.TFateInstanceType;
 import org.apache.accumulo.core.manager.thrift.TFateOperation;
@@ -975,9 +975,9 @@ private void _flush(TableId tableId, Text start, Text end, boolean wait)
       // so pass the tableid to both calls
 
       while (true) {
-        ManagerClientService.Client client = null;
+        AssistantManagerClientService.Client client = null;
         try {
-          client = ThriftClientTypes.MANAGER.getConnectionWithRetry(context);
+          client = ThriftClientTypes.ASSISTANT_MANAGER.getConnectionWithRetry(context);
           flushID =
               client.initiateFlush(TraceUtil.traceInfo(), context.rpcCreds(), tableId.canonical());
           break;
@@ -994,9 +994,9 @@ private void _flush(TableId tableId, Text start, Text end, boolean wait)
       }
 
       while (true) {
-        ManagerClientService.Client client = null;
+        AssistantManagerClientService.Client client = null;
         try {
-          client = ThriftClientTypes.MANAGER.getConnectionWithRetry(context);
+          client = ThriftClientTypes.ASSISTANT_MANAGER.getConnectionWithRetry(context);
           client.waitForFlush(TraceUtil.traceInfo(), context.rpcCreds(), tableId.canonical(),
               TextUtil.getByteBuffer(start), TextUtil.getByteBuffer(end), flushID,
               wait ? Long.MAX_VALUE : 1);
@@ -1059,7 +1059,7 @@ private Map<String,String> tryToModifyProperties(String tableName,
 
     try {
       // Send to server
-      ThriftClientTypes.MANAGER.executeVoid(context,
+      ThriftClientTypes.ASSISTANT_MANAGER.executeVoid(context,
           client -> client.modifyTableProperties(TraceUtil.traceInfo(), context.rpcCreds(),
               tableName, vProperties));
       for (String property : vProperties.getProperties().keySet()) {
@@ -1126,7 +1126,7 @@ private Map<String,String> modifyPropertiesUnwrapped(String tableName,
   private void setPropertyNoChecks(final String tableName, final String property,
       final String value)
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    ThriftClientTypes.MANAGER.executeVoid(context, client -> client
+    ThriftClientTypes.ASSISTANT_MANAGER.executeVoid(context, client -> client
         .setTableProperty(TraceUtil.traceInfo(), context.rpcCreds(), tableName, property, value));
   }
 
@@ -1147,7 +1147,7 @@ public void removeProperty(final String tableName, final String property)
 
   private void removePropertyNoChecks(final String tableName, final String property)
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    ThriftClientTypes.MANAGER.executeVoid(context, client -> client
+    ThriftClientTypes.ASSISTANT_MANAGER.executeVoid(context, client -> client
         .removeTableProperty(TraceUtil.traceInfo(), context.rpcCreds(), tableName, property));
   }