You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by br...@apache.org on 2021/02/05 14:31:37 UTC
[accumulo] branch main updated: Rename Master to Manager in class
names. (#1907)
This is an automated email from the ASF dual-hosted git repository.
brianloss pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new e616490 Rename Master to Manager in class names. (#1907)
e616490 is described below
commit e6164901a3acdd464a7a9beff0126097b53fc06f
Author: Brian Loss <br...@apache.org>
AuthorDate: Fri Feb 5 09:31:25 2021 -0500
Rename Master to Manager in class names. (#1907)
This change renames any non-deprecated classes having "master" in the
class name to the same name but with "master" replaced by "manager."
* Use IDE refactoring to rename classes having "Master" in the name.
* Update accumulo-cluster script to handle the renaming of the
entrypoint Master to Manager.
* Update master.thrift to include class renaming but also rename the
thrift file itself from master.thrift to manager.thrift.
* Remove the main method from the Manager class and move its
implementation to ManagerExecutable instead.
* Add a deprecated Master class in the previous package (master) and
have its main method delegate to MasterExecutable (which in turn
delegates to ManagerExecutable). Log a warning message if the main
method is invoked.
* Update Minicluster exec methods to use KeywordExecutable rather than
main methods (since removal of Manager.main broke minicluster)
---
assemble/bin/accumulo-cluster | 6 +-
.../core/clientImpl/InstanceOperationsImpl.java | 6 +-
.../{MasterClient.java => ManagerClient.java} | 35 +-
.../core/clientImpl/NamespaceOperationsImpl.java | 4 +-
.../core/clientImpl/ReplicationOperationsImpl.java | 2 +-
.../core/clientImpl/SecurityOperationsImpl.java | 2 +-
.../core/clientImpl/TableOperationsImpl.java | 42 +-
...lientService.java => ManagerClientService.java} | 436 +++++++++++----------
...{MasterGoalState.java => ManagerGoalState.java} | 6 +-
...terMonitorInfo.java => ManagerMonitorInfo.java} | 118 +++---
.../thrift/{MasterState.java => ManagerState.java} | 6 +-
core/src/main/scripts/generate-thrift.sh | 2 +-
.../main/thrift/{master.thrift => manager.thrift} | 22 +-
core/src/main/thrift/tabletserver.thrift | 6 +-
.../accumulo/core/conf/ConfigSanityCheckTest.java | 2 +-
.../standalone/StandaloneAccumuloCluster.java | 4 +-
.../standalone/StandaloneClusterControl.java | 4 +-
.../MiniAccumuloClusterControl.java | 22 +-
.../miniclusterImpl/MiniAccumuloClusterImpl.java | 34 +-
.../standalone/StandaloneAccumuloClusterTest.java | 4 +-
.../MiniAccumuloClusterImplTest.java | 12 +-
.../apache/accumulo/server/init/Initialize.java | 4 +-
.../server/manager/state/CurrentState.java | 4 +-
.../manager/state/TabletStateChangeIterator.java | 14 +-
.../server/replication/ReplicationUtil.java | 4 +-
.../org/apache/accumulo/server/util/Admin.java | 14 +-
...rMetadataUtil.java => ManagerMetadataUtil.java} | 4 +-
.../apache/accumulo/server/util/TableInfoUtil.java | 4 +-
.../accumulo/server/util/AdminCommandsTest.java | 1 +
.../accumulo/manager/FateServiceHandler.java | 8 +-
.../accumulo/manager/{Master.java => Manager.java} | 124 +++---
...ndler.java => ManagerClientServiceHandler.java} | 50 +--
.../apache/accumulo/manager/ManagerExecutable.java | 5 +-
.../manager/{MasterTime.java => ManagerTime.java} | 8 +-
.../apache/accumulo/manager/MasterExecutable.java | 3 +-
.../accumulo/manager/TabletGroupWatcher.java | 112 +++---
.../{MasterMetrics.java => ManagerMetrics.java} | 4 +-
...ricsFactory.java => ManagerMetricsFactory.java} | 10 +-
.../manager/metrics/ReplicationMetrics.java | 8 +-
.../accumulo/manager/metrics/fate/FateMetrics.java | 4 +-
.../accumulo/manager/recovery/RecoveryManager.java | 6 +-
...tor.java => ManagerReplicationCoordinator.java} | 12 +-
.../manager/replication/ReplicationDriver.java | 6 +-
.../accumulo/manager/replication/WorkDriver.java | 6 +-
.../accumulo/manager/state/SetGoalState.java | 4 +-
.../apache/accumulo/manager/state/TableStats.java | 8 +-
.../manager/tableOps/ChangeTableState.java | 10 +-
.../tableOps/{MasterRepo.java => ManagerRepo.java} | 10 +-
.../accumulo/manager/tableOps/TraceRepo.java | 6 +-
.../apache/accumulo/manager/tableOps/Utils.java | 18 +-
.../manager/tableOps/bulkVer1/BulkImport.java | 12 +-
.../tableOps/bulkVer1/CleanUpBulkImport.java | 8 +-
.../tableOps/bulkVer1/CompleteBulkImport.java | 8 +-
.../manager/tableOps/bulkVer1/CopyFailed.java | 10 +-
.../manager/tableOps/bulkVer1/LoadFiles.java | 12 +-
.../manager/tableOps/bulkVer2/BulkImportMove.java | 10 +-
.../tableOps/bulkVer2/CleanUpBulkImport.java | 8 +-
.../tableOps/bulkVer2/CompleteBulkImport.java | 8 +-
.../manager/tableOps/bulkVer2/LoadFiles.java | 20 +-
.../manager/tableOps/bulkVer2/PrepBulkImport.java | 14 +-
.../manager/tableOps/clone/CloneMetadata.java | 12 +-
.../manager/tableOps/clone/ClonePermissions.java | 12 +-
.../manager/tableOps/clone/CloneTable.java | 12 +-
.../manager/tableOps/clone/CloneZookeeper.java | 12 +-
.../manager/tableOps/clone/FinishCloneTable.java | 12 +-
.../manager/tableOps/compact/CompactRange.java | 14 +-
.../manager/tableOps/compact/CompactionDriver.java | 12 +-
.../tableOps/compact/cancel/CancelCompactions.java | 12 +-
.../compact/cancel/FinishCancelCompaction.java | 10 +-
.../manager/tableOps/create/ChooseDir.java | 18 +-
.../manager/tableOps/create/CreateTable.java | 12 +-
.../manager/tableOps/create/FinishCreateTable.java | 14 +-
.../manager/tableOps/create/PopulateMetadata.java | 12 +-
.../manager/tableOps/create/PopulateZookeeper.java | 12 +-
.../manager/tableOps/create/SetupPermissions.java | 10 +-
.../accumulo/manager/tableOps/delete/CleanUp.java | 12 +-
.../manager/tableOps/delete/DeleteTable.java | 12 +-
.../manager/tableOps/merge/TableRangeOp.java | 12 +-
.../manager/tableOps/merge/TableRangeOpWait.java | 10 +-
.../tableOps/namespace/create/CreateNamespace.java | 12 +-
.../namespace/create/FinishCreateNamespace.java | 12 +-
.../create/PopulateZookeeperWithNamespace.java | 12 +-
.../create/SetupNamespacePermissions.java | 8 +-
.../tableOps/namespace/delete/DeleteNamespace.java | 12 +-
.../namespace/delete/NamespaceCleanUp.java | 12 +-
.../tableOps/namespace/rename/RenameNamespace.java | 12 +-
.../manager/tableOps/rename/RenameTable.java | 12 +-
.../manager/tableOps/tableExport/ExportTable.java | 12 +-
.../tableOps/tableExport/WriteExportFiles.java | 12 +-
.../tableOps/tableImport/CreateImportDir.java | 10 +-
.../tableOps/tableImport/FinishImportTable.java | 12 +-
.../tableImport/ImportPopulateZookeeper.java | 12 +-
.../tableImport/ImportSetupPermissions.java | 12 +-
.../manager/tableOps/tableImport/ImportTable.java | 14 +-
.../tableOps/tableImport/MapImportFileNames.java | 10 +-
.../tableOps/tableImport/MoveExportedFiles.java | 8 +-
.../tableImport/PopulateMetadataTable.java | 10 +-
.../manager/tserverOps/ShutdownTServer.java | 12 +-
.../apache/accumulo/manager/util/FateAdmin.java | 6 +-
.../MasterMetrics.java => master/Master.java} | 21 +-
.../manager/metrics/ReplicationMetricsTest.java | 6 +-
...java => ManagerReplicationCoordinatorTest.java} | 16 +-
.../manager/tableOps/ShutdownTServerTest.java | 6 +-
.../tableOps/tableImport/ImportTableTest.java | 4 +-
.../java/org/apache/accumulo/monitor/Monitor.java | 18 +-
.../accumulo/monitor/rest/SummaryInformation.java | 4 +-
.../apache/accumulo/monitor/rest/XMLResource.java | 8 +-
.../rest/bulkImports/BulkImportResource.java | 4 +-
...terInformation.java => ManagerInformation.java} | 8 +-
.../{MasterResource.java => ManagerResource.java} | 30 +-
.../accumulo/monitor/rest/scans/ScansResource.java | 4 +-
.../monitor/rest/status/StatusResource.java | 4 +-
.../monitor/rest/tables/TablesResource.java | 6 +-
.../rest/tservers/TabletServerResource.java | 12 +-
.../monitor/rest/tservers/TabletServers.java | 4 +-
.../rest/tservers/TabletServerInformationTest.java | 2 +-
.../apache/accumulo/tserver/AssignmentHandler.java | 4 +-
.../org/apache/accumulo/tserver/TabletServer.java | 28 +-
.../{MasterMessage.java => ManagerMessage.java} | 6 +-
.../tserver/mastermessage/SplitReportMessage.java | 6 +-
.../tserver/mastermessage/TabletStatusMessage.java | 4 +-
.../accumulo/tserver/tablet/DatafileManager.java | 4 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 6 +-
.../shell/commands/BulkImportListIterator.java | 4 +-
.../accumulo/shell/commands/ListBulkCommand.java | 16 +-
.../accumulo/test/BulkImportMonitoringIT.java | 4 +-
.../accumulo/test/CountNameNodeOpsBulkIT.java | 4 +-
.../accumulo/test/DetectDeadTabletServersIT.java | 16 +-
.../{GetMasterStats.java => GetManagerStats.java} | 18 +-
...IT.java => ManagerRepairsDualAssignmentIT.java} | 2 +-
.../ThriftServerBindsBeforeZooKeeperLockIT.java | 4 +-
.../{BackupMasterIT.java => BackupManagerIT.java} | 6 +-
.../functional/BalanceAfterCommsFailureIT.java | 16 +-
.../BalanceInPresenceOfOfflineTableIT.java | 16 +-
.../accumulo/test/functional/ManagerApiIT.java | 16 +-
...rAssignmentIT.java => ManagerAssignmentIT.java} | 2 +-
...asterFailoverIT.java => ManagerFailoverIT.java} | 2 +-
...{MasterMetricsIT.java => ManagerMetricsIT.java} | 4 +-
.../test/functional/MetadataMaxFilesIT.java | 14 +-
.../test/functional/SimpleBalancerFairnessIT.java | 16 +-
.../accumulo/test/functional/SplitRecoveryIT.java | 8 +-
.../functional/TabletStateChangeIteratorIT.java | 6 +-
.../apache/accumulo/test/manager/MergeStateIT.java | 6 +-
.../accumulo/test/manager/SuspendedTabletsIT.java | 6 +-
.../test/metrics/fate/FateMetricsTest.java | 22 +-
...GarbageCollectorCommunicatesWithTServersIT.java | 4 +-
.../replication/ReplicationOperationsImplIT.java | 8 +-
.../apache/accumulo/test/start/KeywordStartIT.java | 4 +-
test/src/main/resources/log4j2-test.properties | 2 +-
149 files changed, 1143 insertions(+), 1108 deletions(-)
diff --git a/assemble/bin/accumulo-cluster b/assemble/bin/accumulo-cluster
index 8dd6ec0..e5ebffa 100755
--- a/assemble/bin/accumulo-cluster
+++ b/assemble/bin/accumulo-cluster
@@ -235,8 +235,8 @@ function stop_tservers() {
function kill_all() {
echo "Killing Accumulo cluster..."
- for master in $(grep -v '^#' "${conf}/$manager_file"); do
- kill_service "$master" master
+ for manager in $(grep -v '^#' "${conf}/$manager_file"); do
+ kill_service "$manager" manager
done
for gc in $(grep -v '^#' "${conf}/gc"); do
@@ -313,7 +313,7 @@ function stop_here() {
for host in "${hosts_to_check[@]}"; do
for end_cmd in "stop" "kill"; do
- for svc in tserver gc master monitor tracer; do
+ for svc in tserver gc manager monitor tracer; do
end_service "$host" $svc $end_cmd
done
done
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
index 5e1d8a3..8dea8ff 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
@@ -74,7 +74,7 @@ public class InstanceOperationsImpl implements InstanceOperations {
log.warn("{} was deprecated and will be removed in a future release;"
+ " setting its replacement {} instead", property, replacement);
});
- MasterClient.executeVoid(context, client -> client.setSystemProperty(TraceUtil.traceInfo(),
+ ManagerClient.executeVoid(context, client -> client.setSystemProperty(TraceUtil.traceInfo(),
context.rpcCreds(), property, value));
checkLocalityGroups(property);
}
@@ -89,7 +89,7 @@ public class InstanceOperationsImpl implements InstanceOperations {
log.warn("{} was deprecated and will be removed in a future release; assuming user meant"
+ " its replacement {} and will remove that instead", property, replacement);
});
- MasterClient.executeVoid(context,
+ ManagerClient.executeVoid(context,
client -> client.removeSystemProperty(TraceUtil.traceInfo(), context.rpcCreds(), property));
checkLocalityGroups(property);
}
@@ -218,7 +218,7 @@ public class InstanceOperationsImpl implements InstanceOperations {
@Override
public void waitForBalance() throws AccumuloException {
try {
- MasterClient.executeVoid(context, client -> client.waitForBalance(TraceUtil.traceInfo()));
+ ManagerClient.executeVoid(context, client -> client.waitForBalance(TraceUtil.traceInfo()));
} catch (AccumuloSecurityException ex) {
// should never happen
throw new RuntimeException("Unexpected exception thrown", ex);
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/MasterClient.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ManagerClient.java
similarity index 85%
rename from core/src/main/java/org/apache/accumulo/core/clientImpl/MasterClient.java
rename to core/src/main/java/org/apache/accumulo/core/clientImpl/ManagerClient.java
index f175a64..2c9c24f 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/MasterClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ManagerClient.java
@@ -32,7 +32,7 @@ import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException;
import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.util.HostAndPort;
import org.apache.thrift.TServiceClient;
@@ -40,20 +40,20 @@ import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class MasterClient {
- private static final Logger log = LoggerFactory.getLogger(MasterClient.class);
+public class ManagerClient {
+ private static final Logger log = LoggerFactory.getLogger(ManagerClient.class);
- public static MasterClientService.Client getConnectionWithRetry(ClientContext context) {
+ public static ManagerClientService.Client getConnectionWithRetry(ClientContext context) {
while (true) {
- MasterClientService.Client result = getConnection(context);
+ ManagerClientService.Client result = getConnection(context);
if (result != null)
return result;
sleepUninterruptibly(250, TimeUnit.MILLISECONDS);
}
}
- public static MasterClientService.Client getConnection(ClientContext context) {
+ public static ManagerClientService.Client getConnection(ClientContext context) {
checkArgument(context != null, "context is null");
List<String> locations = context.getMasterLocations();
@@ -69,7 +69,7 @@ public class MasterClient {
try {
// Master requests can take a long time: don't ever time out
- return ThriftUtil.getClientNoTimeout(new MasterClientService.Client.Factory(), master,
+ return ThriftUtil.getClientNoTimeout(new ManagerClientService.Client.Factory(), master,
context);
} catch (TTransportException tte) {
Throwable cause = tte.getCause();
@@ -82,7 +82,7 @@ public class MasterClient {
}
}
- public static void close(MasterClientService.Iface iface) {
+ public static void close(ManagerClientService.Iface iface) {
TServiceClient client = (TServiceClient) iface;
if (client != null && client.getInputProtocol() != null
&& client.getInputProtocol().getTransport() != null) {
@@ -93,15 +93,15 @@ public class MasterClient {
}
public static <T> T execute(ClientContext context,
- ClientExecReturn<T,MasterClientService.Client> exec)
+ ClientExecReturn<T,ManagerClientService.Client> exec)
throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
- MasterClientService.Client client = null;
+ ManagerClientService.Client client = null;
while (true) {
try {
client = getConnectionWithRetry(context);
return exec.execute(client);
} catch (TTransportException tte) {
- log.debug("MasterClient request failed, retrying ... ", tte);
+ log.debug("ManagerClient request failed, retrying ... ", tte);
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} catch (ThriftSecurityException e) {
throw new AccumuloSecurityException(e.user, e.code, e);
@@ -130,16 +130,16 @@ public class MasterClient {
}
public static void executeGeneric(ClientContext context,
- ClientExec<MasterClientService.Client> exec)
+ ClientExec<ManagerClientService.Client> exec)
throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
- MasterClientService.Client client = null;
+ ManagerClientService.Client client = null;
while (true) {
try {
client = getConnectionWithRetry(context);
exec.execute(client);
break;
} catch (TTransportException tte) {
- log.debug("MasterClient request failed, retrying ... ", tte);
+ log.debug("ManagerClient request failed, retrying ... ", tte);
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} catch (ThriftSecurityException e) {
throw new AccumuloSecurityException(e.user, e.code, e);
@@ -168,13 +168,13 @@ public class MasterClient {
}
public static void executeTable(ClientContext context,
- ClientExec<MasterClientService.Client> exec)
+ ClientExec<ManagerClientService.Client> exec)
throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
executeGeneric(context, exec);
}
public static void executeNamespace(ClientContext context,
- ClientExec<MasterClientService.Client> exec)
+ ClientExec<ManagerClientService.Client> exec)
throws AccumuloException, AccumuloSecurityException, NamespaceNotFoundException {
try {
executeGeneric(context, exec);
@@ -184,7 +184,8 @@ public class MasterClient {
}
}
- public static void executeVoid(ClientContext context, ClientExec<MasterClientService.Client> exec)
+ public static void executeVoid(ClientContext context,
+ ClientExec<ManagerClientService.Client> exec)
throws AccumuloException, AccumuloSecurityException {
try {
executeGeneric(context, exec);
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
index ed74e03..bd2385f 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
@@ -181,7 +181,7 @@ public class NamespaceOperationsImpl extends NamespaceOperationsHelper {
checkArgument(property != null, "property is null");
checkArgument(value != null, "value is null");
- MasterClient.executeNamespace(context,
+ ManagerClient.executeNamespace(context,
client -> client.setNamespaceProperty(TraceUtil.traceInfo(), context.rpcCreds(), namespace,
property, value));
checkLocalityGroups(namespace, property);
@@ -193,7 +193,7 @@ public class NamespaceOperationsImpl extends NamespaceOperationsHelper {
checkArgument(namespace != null, "namespace is null");
checkArgument(property != null, "property is null");
- MasterClient.executeNamespace(context, client -> client
+ ManagerClient.executeNamespace(context, client -> client
.removeNamespaceProperty(TraceUtil.traceInfo(), context.rpcCreds(), namespace, property));
checkLocalityGroups(namespace, property);
}
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ReplicationOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ReplicationOperationsImpl.java
index d8fa5d6..b2a111d 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ReplicationOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ReplicationOperationsImpl.java
@@ -115,7 +115,7 @@ public class ReplicationOperationsImpl implements ReplicationOperations {
protected boolean getMasterDrain(final TInfo tinfo, final TCredentials rpcCreds,
final String tableName, final Set<String> wals)
throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
- return MasterClient.execute(context,
+ return ManagerClient.execute(context,
client -> client.drainReplicationTable(tinfo, rpcCreds, tableName, wals));
}
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/SecurityOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/SecurityOperationsImpl.java
index 1657033..94a6dbf 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/SecurityOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/SecurityOperationsImpl.java
@@ -288,7 +288,7 @@ public class SecurityOperationsImpl implements SecurityOperations {
TDelegationToken thriftToken;
try {
- thriftToken = MasterClient.execute(context,
+ thriftToken = ManagerClient.execute(context,
client -> client.getDelegationToken(TraceUtil.traceInfo(), context.rpcCreds(), tConfig));
} catch (TableNotFoundException e) {
// should never happen
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
index 1ab9a8b..e81bafd 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
@@ -114,7 +114,7 @@ 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.master.thrift.FateOperation;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
import org.apache.accumulo.core.metadata.MetadataServicer;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
@@ -252,9 +252,9 @@ public class TableOperationsImpl extends TableOperationsHelper {
private long beginFateOperation() throws ThriftSecurityException, TException {
while (true) {
- MasterClientService.Iface client = null;
+ ManagerClientService.Iface client = null;
try {
- client = MasterClient.getConnectionWithRetry(context);
+ client = ManagerClient.getConnectionWithRetry(context);
return client.beginFateOperation(TraceUtil.traceInfo(), context.rpcCreds());
} catch (TTransportException tte) {
log.debug("Failed to call beginFateOperation(), retrying ... ", tte);
@@ -264,7 +264,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
log.debug("Contacted a Master which is no longer active, retrying");
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} finally {
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
}
@@ -275,9 +275,9 @@ public class TableOperationsImpl extends TableOperationsHelper {
Map<String,String> opts, boolean autoCleanUp)
throws ThriftSecurityException, TException, ThriftTableOperationException {
while (true) {
- MasterClientService.Iface client = null;
+ ManagerClientService.Iface client = null;
try {
- client = MasterClient.getConnectionWithRetry(context);
+ client = ManagerClient.getConnectionWithRetry(context);
client.executeFateOperation(TraceUtil.traceInfo(), context.rpcCreds(), opid, op, args, opts,
autoCleanUp);
return;
@@ -289,7 +289,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
log.debug("Contacted a Master which is no longer active, retrying");
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} finally {
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
}
@@ -297,9 +297,9 @@ public class TableOperationsImpl extends TableOperationsHelper {
private String waitForFateOperation(long opid)
throws ThriftSecurityException, TException, ThriftTableOperationException {
while (true) {
- MasterClientService.Iface client = null;
+ ManagerClientService.Iface client = null;
try {
- client = MasterClient.getConnectionWithRetry(context);
+ client = ManagerClient.getConnectionWithRetry(context);
return client.waitForFateOperation(TraceUtil.traceInfo(), context.rpcCreds(), opid);
} catch (TTransportException tte) {
log.debug("Failed to call waitForFateOperation(), retrying ... ", tte);
@@ -309,16 +309,16 @@ public class TableOperationsImpl extends TableOperationsHelper {
log.debug("Contacted a Master which is no longer active, retrying");
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} finally {
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
}
private void finishFateOperation(long opid) throws ThriftSecurityException, TException {
while (true) {
- MasterClientService.Iface client = null;
+ ManagerClientService.Iface client = null;
try {
- client = MasterClient.getConnectionWithRetry(context);
+ client = ManagerClient.getConnectionWithRetry(context);
client.finishFateOperation(TraceUtil.traceInfo(), context.rpcCreds(), opid);
break;
} catch (TTransportException tte) {
@@ -329,7 +329,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
log.debug("Contacted a Master which is no longer active, retrying");
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} finally {
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
}
@@ -931,9 +931,9 @@ public class TableOperationsImpl extends TableOperationsHelper {
// so pass the tableid to both calls
while (true) {
- MasterClientService.Iface client = null;
+ ManagerClientService.Iface client = null;
try {
- client = MasterClient.getConnectionWithRetry(context);
+ client = ManagerClient.getConnectionWithRetry(context);
flushID =
client.initiateFlush(TraceUtil.traceInfo(), context.rpcCreds(), tableId.canonical());
break;
@@ -945,14 +945,14 @@ public class TableOperationsImpl extends TableOperationsHelper {
log.debug("Contacted a Master which is no longer active, retrying");
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} finally {
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
while (true) {
- MasterClientService.Iface client = null;
+ ManagerClientService.Iface client = null;
try {
- client = MasterClient.getConnectionWithRetry(context);
+ client = ManagerClient.getConnectionWithRetry(context);
client.waitForFlush(TraceUtil.traceInfo(), context.rpcCreds(), tableId.canonical(),
TextUtil.getByteBuffer(start), TextUtil.getByteBuffer(end), flushID,
wait ? Long.MAX_VALUE : 1);
@@ -965,7 +965,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
log.debug("Contacted a Master which is no longer active, retrying");
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} finally {
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
} catch (ThriftSecurityException e) {
@@ -1006,7 +1006,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
private void setPropertyNoChecks(final String tableName, final String property,
final String value)
throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
- MasterClient.executeTable(context, client -> client.setTableProperty(TraceUtil.traceInfo(),
+ ManagerClient.executeTable(context, client -> client.setTableProperty(TraceUtil.traceInfo(),
context.rpcCreds(), tableName, property, value));
}
@@ -1026,7 +1026,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
private void removePropertyNoChecks(final String tableName, final String property)
throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
- MasterClient.executeTable(context, client -> client.removeTableProperty(TraceUtil.traceInfo(),
+ ManagerClient.executeTable(context, client -> client.removeTableProperty(TraceUtil.traceInfo(),
context.rpcCreds(), tableName, property));
}
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/ManagerClientService.java
similarity index 97%
rename from core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
rename to core/src/main/java/org/apache/accumulo/core/master/thrift/ManagerClientService.java
index 1962886..f9f6454 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/ManagerClientService.java
@@ -25,7 +25,7 @@
package org.apache.accumulo.core.master.thrift;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-public class MasterClientService {
+public class ManagerClientService {
public interface Iface extends FateService.Iface {
@@ -41,7 +41,7 @@ public class MasterClientService {
public void removeNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String ns, java.lang.String property) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
- public void setMasterGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, MasterGoalState state) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
+ public void setManagerGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, ManagerGoalState state) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
public void shutdown(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, boolean stopTabletServers) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
@@ -51,7 +51,7 @@ public class MasterClientService {
public void removeSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String property) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
- public MasterMonitorInfo getMasterStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
+ public ManagerMonitorInfo getManagerStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
public void waitForBalance(org.apache.accumulo.core.trace.thrift.TInfo tinfo) throws org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
@@ -81,7 +81,7 @@ public class MasterClientService {
public void removeNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String ns, java.lang.String property, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
- public void setMasterGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, MasterGoalState state, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+ public void setManagerGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, ManagerGoalState state, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
public void shutdown(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, boolean stopTabletServers, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
@@ -91,7 +91,7 @@ public class MasterClientService {
public void removeSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String property, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
- public void getMasterStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<MasterMonitorInfo> resultHandler) throws org.apache.thrift.TException;
+ public void getManagerStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<ManagerMonitorInfo> resultHandler) throws org.apache.thrift.TException;
public void waitForBalance(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
@@ -326,25 +326,25 @@ public class MasterClientService {
return;
}
- public void setMasterGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, MasterGoalState state) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
+ public void setManagerGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, ManagerGoalState state) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
{
- send_setMasterGoalState(tinfo, credentials, state);
- recv_setMasterGoalState();
+ send_setManagerGoalState(tinfo, credentials, state);
+ recv_setManagerGoalState();
}
- public void send_setMasterGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, MasterGoalState state) throws org.apache.thrift.TException
+ public void send_setManagerGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, ManagerGoalState state) throws org.apache.thrift.TException
{
- setMasterGoalState_args args = new setMasterGoalState_args();
+ setManagerGoalState_args args = new setManagerGoalState_args();
args.setTinfo(tinfo);
args.setCredentials(credentials);
args.setState(state);
- sendBase("setMasterGoalState", args);
+ sendBase("setManagerGoalState", args);
}
- public void recv_setMasterGoalState() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
+ public void recv_setManagerGoalState() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
{
- setMasterGoalState_result result = new setMasterGoalState_result();
- receiveBase(result, "setMasterGoalState");
+ setManagerGoalState_result result = new setManagerGoalState_result();
+ receiveBase(result, "setManagerGoalState");
if (result.sec != null) {
throw result.sec;
}
@@ -468,24 +468,24 @@ public class MasterClientService {
return;
}
- public MasterMonitorInfo getMasterStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
+ public ManagerMonitorInfo getManagerStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
{
- send_getMasterStats(tinfo, credentials);
- return recv_getMasterStats();
+ send_getManagerStats(tinfo, credentials);
+ return recv_getManagerStats();
}
- public void send_getMasterStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws org.apache.thrift.TException
+ public void send_getManagerStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws org.apache.thrift.TException
{
- getMasterStats_args args = new getMasterStats_args();
+ getManagerStats_args args = new getManagerStats_args();
args.setTinfo(tinfo);
args.setCredentials(credentials);
- sendBase("getMasterStats", args);
+ sendBase("getManagerStats", args);
}
- public MasterMonitorInfo recv_getMasterStats() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
+ public ManagerMonitorInfo recv_getManagerStats() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
{
- getMasterStats_result result = new getMasterStats_result();
- receiveBase(result, "getMasterStats");
+ getManagerStats_result result = new getManagerStats_result();
+ receiveBase(result, "getManagerStats");
if (result.isSetSuccess()) {
return result.success;
}
@@ -495,7 +495,7 @@ public class MasterClientService {
if (result.tnase != null) {
throw result.tnase;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getMasterStats failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getManagerStats failed: unknown result");
}
public void waitForBalance(org.apache.accumulo.core.trace.thrift.TInfo tinfo) throws org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
@@ -918,18 +918,18 @@ public class MasterClientService {
}
}
- public void setMasterGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, MasterGoalState state, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+ public void setManagerGoalState(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, ManagerGoalState state, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
checkReady();
- setMasterGoalState_call method_call = new setMasterGoalState_call(tinfo, credentials, state, resultHandler, this, ___protocolFactory, ___transport);
+ setManagerGoalState_call method_call = new setManagerGoalState_call(tinfo, credentials, state, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class setMasterGoalState_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+ public static class setManagerGoalState_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
private org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials;
- private MasterGoalState state;
- public setMasterGoalState_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, MasterGoalState state, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ private ManagerGoalState state;
+ public setManagerGoalState_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, ManagerGoalState state, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.tinfo = tinfo;
this.credentials = credentials;
@@ -937,8 +937,8 @@ public class MasterClientService {
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("setMasterGoalState", org.apache.thrift.protocol.TMessageType.CALL, 0));
- setMasterGoalState_args args = new setMasterGoalState_args();
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("setManagerGoalState", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ setManagerGoalState_args args = new setManagerGoalState_args();
args.setTinfo(tinfo);
args.setCredentials(credentials);
args.setState(state);
@@ -1114,38 +1114,38 @@ public class MasterClientService {
}
}
- public void getMasterStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<MasterMonitorInfo> resultHandler) throws org.apache.thrift.TException {
+ public void getManagerStats(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<ManagerMonitorInfo> resultHandler) throws org.apache.thrift.TException {
checkReady();
- getMasterStats_call method_call = new getMasterStats_call(tinfo, credentials, resultHandler, this, ___protocolFactory, ___transport);
+ getManagerStats_call method_call = new getManagerStats_call(tinfo, credentials, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class getMasterStats_call extends org.apache.thrift.async.TAsyncMethodCall<MasterMonitorInfo> {
+ public static class getManagerStats_call extends org.apache.thrift.async.TAsyncMethodCall<ManagerMonitorInfo> {
private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
private org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials;
- public getMasterStats_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<MasterMonitorInfo> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getManagerStats_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<ManagerMonitorInfo> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.tinfo = tinfo;
this.credentials = credentials;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getMasterStats", org.apache.thrift.protocol.TMessageType.CALL, 0));
- getMasterStats_args args = new getMasterStats_args();
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getManagerStats", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ getManagerStats_args args = new getManagerStats_args();
args.setTinfo(tinfo);
args.setCredentials(credentials);
args.write(prot);
prot.writeMessageEnd();
}
- public MasterMonitorInfo getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException {
+ public ManagerMonitorInfo getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new java.lang.IllegalStateException("Method call not finished!");
}
org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
- return (new Client(prot)).recv_getMasterStats();
+ return (new Client(prot)).recv_getManagerStats();
}
}
@@ -1399,12 +1399,12 @@ public class MasterClientService {
processMap.put("removeTableProperty", new removeTableProperty());
processMap.put("setNamespaceProperty", new setNamespaceProperty());
processMap.put("removeNamespaceProperty", new removeNamespaceProperty());
- processMap.put("setMasterGoalState", new setMasterGoalState());
+ processMap.put("setManagerGoalState", new setManagerGoalState());
processMap.put("shutdown", new shutdown());
processMap.put("shutdownTabletServer", new shutdownTabletServer());
processMap.put("setSystemProperty", new setSystemProperty());
processMap.put("removeSystemProperty", new removeSystemProperty());
- processMap.put("getMasterStats", new getMasterStats());
+ processMap.put("getManagerStats", new getManagerStats());
processMap.put("waitForBalance", new waitForBalance());
processMap.put("reportSplitExtent", new reportSplitExtent());
processMap.put("reportTabletStatus", new reportTabletStatus());
@@ -1613,13 +1613,13 @@ public class MasterClientService {
}
}
- public static class setMasterGoalState<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setMasterGoalState_args> {
- public setMasterGoalState() {
- super("setMasterGoalState");
+ public static class setManagerGoalState<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setManagerGoalState_args> {
+ public setManagerGoalState() {
+ super("setManagerGoalState");
}
- public setMasterGoalState_args getEmptyArgsInstance() {
- return new setMasterGoalState_args();
+ public setManagerGoalState_args getEmptyArgsInstance() {
+ return new setManagerGoalState_args();
}
protected boolean isOneway() {
@@ -1631,10 +1631,10 @@ public class MasterClientService {
return false;
}
- public setMasterGoalState_result getResult(I iface, setMasterGoalState_args args) throws org.apache.thrift.TException {
- setMasterGoalState_result result = new setMasterGoalState_result();
+ public setManagerGoalState_result getResult(I iface, setManagerGoalState_args args) throws org.apache.thrift.TException {
+ setManagerGoalState_result result = new setManagerGoalState_result();
try {
- iface.setMasterGoalState(args.tinfo, args.credentials, args.state);
+ iface.setManagerGoalState(args.tinfo, args.credentials, args.state);
} catch (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
result.sec = sec;
} catch (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
@@ -1768,13 +1768,13 @@ public class MasterClientService {
}
}
- public static class getMasterStats<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getMasterStats_args> {
- public getMasterStats() {
- super("getMasterStats");
+ public static class getManagerStats<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getManagerStats_args> {
+ public getManagerStats() {
+ super("getManagerStats");
}
- public getMasterStats_args getEmptyArgsInstance() {
- return new getMasterStats_args();
+ public getManagerStats_args getEmptyArgsInstance() {
+ return new getManagerStats_args();
}
protected boolean isOneway() {
@@ -1786,10 +1786,10 @@ public class MasterClientService {
return false;
}
- public getMasterStats_result getResult(I iface, getMasterStats_args args) throws org.apache.thrift.TException {
- getMasterStats_result result = new getMasterStats_result();
+ public getManagerStats_result getResult(I iface, getManagerStats_args args) throws org.apache.thrift.TException {
+ getManagerStats_result result = new getManagerStats_result();
try {
- result.success = iface.getMasterStats(args.tinfo, args.credentials);
+ result.success = iface.getManagerStats(args.tinfo, args.credentials);
} catch (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
result.sec = sec;
} catch (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
@@ -1987,12 +1987,12 @@ public class MasterClientService {
processMap.put("removeTableProperty", new removeTableProperty());
processMap.put("setNamespaceProperty", new setNamespaceProperty());
processMap.put("removeNamespaceProperty", new removeNamespaceProperty());
- processMap.put("setMasterGoalState", new setMasterGoalState());
+ processMap.put("setManagerGoalState", new setManagerGoalState());
processMap.put("shutdown", new shutdown());
processMap.put("shutdownTabletServer", new shutdownTabletServer());
processMap.put("setSystemProperty", new setSystemProperty());
processMap.put("removeSystemProperty", new removeSystemProperty());
- processMap.put("getMasterStats", new getMasterStats());
+ processMap.put("getManagerStats", new getManagerStats());
processMap.put("waitForBalance", new waitForBalance());
processMap.put("reportSplitExtent", new reportSplitExtent());
processMap.put("reportTabletStatus", new reportTabletStatus());
@@ -2436,20 +2436,20 @@ public class MasterClientService {
}
}
- public static class setMasterGoalState<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, setMasterGoalState_args, Void> {
- public setMasterGoalState() {
- super("setMasterGoalState");
+ public static class setManagerGoalState<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, setManagerGoalState_args, Void> {
+ public setManagerGoalState() {
+ super("setManagerGoalState");
}
- public setMasterGoalState_args getEmptyArgsInstance() {
- return new setMasterGoalState_args();
+ public setManagerGoalState_args getEmptyArgsInstance() {
+ return new setManagerGoalState_args();
}
public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new org.apache.thrift.async.AsyncMethodCallback<Void>() {
public void onComplete(Void o) {
- setMasterGoalState_result result = new setMasterGoalState_result();
+ setManagerGoalState_result result = new setManagerGoalState_result();
try {
fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
} catch (org.apache.thrift.transport.TTransportException e) {
@@ -2463,7 +2463,7 @@ public class MasterClientService {
public void onError(java.lang.Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TSerializable msg;
- setMasterGoalState_result result = new setMasterGoalState_result();
+ setManagerGoalState_result result = new setManagerGoalState_result();
if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) {
result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e;
result.setSecIsSet(true);
@@ -2499,8 +2499,8 @@ public class MasterClientService {
return false;
}
- public void start(I iface, setMasterGoalState_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
- iface.setMasterGoalState(args.tinfo, args.credentials, args.state,resultHandler);
+ public void start(I iface, setManagerGoalState_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+ iface.setManagerGoalState(args.tinfo, args.credentials, args.state,resultHandler);
}
}
@@ -2776,20 +2776,20 @@ public class MasterClientService {
}
}
- public static class getMasterStats<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getMasterStats_args, MasterMonitorInfo> {
- public getMasterStats() {
- super("getMasterStats");
+ public static class getManagerStats<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getManagerStats_args,ManagerMonitorInfo> {
+ public getManagerStats() {
+ super("getManagerStats");
}
- public getMasterStats_args getEmptyArgsInstance() {
- return new getMasterStats_args();
+ public getManagerStats_args getEmptyArgsInstance() {
+ return new getManagerStats_args();
}
- public org.apache.thrift.async.AsyncMethodCallback<MasterMonitorInfo> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+ public org.apache.thrift.async.AsyncMethodCallback<ManagerMonitorInfo> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new org.apache.thrift.async.AsyncMethodCallback<MasterMonitorInfo>() {
- public void onComplete(MasterMonitorInfo o) {
- getMasterStats_result result = new getMasterStats_result();
+ return new org.apache.thrift.async.AsyncMethodCallback<ManagerMonitorInfo>() {
+ public void onComplete(ManagerMonitorInfo o) {
+ getManagerStats_result result = new getManagerStats_result();
result.success = o;
try {
fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -2804,7 +2804,7 @@ public class MasterClientService {
public void onError(java.lang.Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TSerializable msg;
- getMasterStats_result result = new getMasterStats_result();
+ getManagerStats_result result = new getManagerStats_result();
if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) {
result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e;
result.setSecIsSet(true);
@@ -2840,8 +2840,8 @@ public class MasterClientService {
return false;
}
- public void start(I iface, getMasterStats_args args, org.apache.thrift.async.AsyncMethodCallback<MasterMonitorInfo> resultHandler) throws org.apache.thrift.TException {
- iface.getMasterStats(args.tinfo, args.credentials,resultHandler);
+ public void start(I iface, getManagerStats_args args, org.apache.thrift.async.AsyncMethodCallback<ManagerMonitorInfo> resultHandler) throws org.apache.thrift.TException {
+ iface.getManagerStats(args.tinfo, args.credentials,resultHandler);
}
}
@@ -11367,23 +11367,23 @@ public class MasterClientService {
}
}
- public static class setMasterGoalState_args implements org.apache.thrift.TBase<setMasterGoalState_args, setMasterGoalState_args._Fields>, java.io.Serializable, Cloneable, Comparable<setMasterGoalState_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setMasterGoalState_args");
+ public static class setManagerGoalState_args implements org.apache.thrift.TBase<setManagerGoalState_args, setManagerGoalState_args._Fields>, java.io.Serializable, Cloneable, Comparable<setManagerGoalState_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setManagerGoalState_args");
private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)3);
private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)2);
- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setMasterGoalState_argsStandardSchemeFactory();
- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setMasterGoalState_argsTupleSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setManagerGoalState_argsStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setManagerGoalState_argsTupleSchemeFactory();
public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.trace.thrift.TInfo tinfo; // required
public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required
/**
*
- * @see MasterGoalState
+ * @see ManagerGoalState
*/
- public @org.apache.thrift.annotation.Nullable MasterGoalState state; // required
+ public @org.apache.thrift.annotation.Nullable ManagerGoalState state; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -11391,7 +11391,7 @@ public class MasterClientService {
CREDENTIALS((short)1, "credentials"),
/**
*
- * @see MasterGoalState
+ * @see ManagerGoalState
*/
STATE((short)2, "state");
@@ -11464,18 +11464,18 @@ public class MasterClientService {
tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class)));
tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, MasterGoalState.class)));
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ManagerGoalState.class)));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setMasterGoalState_args.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setManagerGoalState_args.class, metaDataMap);
}
- public setMasterGoalState_args() {
+ public setManagerGoalState_args() {
}
- public setMasterGoalState_args(
+ public setManagerGoalState_args(
org.apache.accumulo.core.trace.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
- MasterGoalState state)
+ ManagerGoalState state)
{
this();
this.tinfo = tinfo;
@@ -11486,7 +11486,7 @@ public class MasterClientService {
/**
* Performs a deep copy on <i>other</i>.
*/
- public setMasterGoalState_args(setMasterGoalState_args other) {
+ public setManagerGoalState_args(setManagerGoalState_args other) {
if (other.isSetTinfo()) {
this.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(other.tinfo);
}
@@ -11498,8 +11498,8 @@ public class MasterClientService {
}
}
- public setMasterGoalState_args deepCopy() {
- return new setMasterGoalState_args(this);
+ public setManagerGoalState_args deepCopy() {
+ return new setManagerGoalState_args(this);
}
@Override
@@ -11514,7 +11514,7 @@ public class MasterClientService {
return this.tinfo;
}
- public setMasterGoalState_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.trace.thrift.TInfo tinfo) {
+ public setManagerGoalState_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.trace.thrift.TInfo tinfo) {
this.tinfo = tinfo;
return this;
}
@@ -11539,7 +11539,7 @@ public class MasterClientService {
return this.credentials;
}
- public setMasterGoalState_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
+ public setManagerGoalState_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
this.credentials = credentials;
return this;
}
@@ -11561,18 +11561,19 @@ public class MasterClientService {
/**
*
- * @see MasterGoalState
+ * @see ManagerGoalState
*/
@org.apache.thrift.annotation.Nullable
- public MasterGoalState getState() {
+ public ManagerGoalState getState() {
return this.state;
}
/**
*
- * @see MasterGoalState
+ * @see ManagerGoalState
*/
- public setMasterGoalState_args setState(@org.apache.thrift.annotation.Nullable MasterGoalState state) {
+ public setManagerGoalState_args setState(@org.apache.thrift.annotation.Nullable
+ ManagerGoalState state) {
this.state = state;
return this;
}
@@ -11614,7 +11615,7 @@ public class MasterClientService {
if (value == null) {
unsetState();
} else {
- setState((MasterGoalState)value);
+ setState((ManagerGoalState)value);
}
break;
@@ -11658,12 +11659,12 @@ public class MasterClientService {
public boolean equals(java.lang.Object that) {
if (that == null)
return false;
- if (that instanceof setMasterGoalState_args)
- return this.equals((setMasterGoalState_args)that);
+ if (that instanceof setManagerGoalState_args)
+ return this.equals((setManagerGoalState_args)that);
return false;
}
- public boolean equals(setMasterGoalState_args that) {
+ public boolean equals(setManagerGoalState_args that) {
if (that == null)
return false;
if (this == that)
@@ -11719,7 +11720,7 @@ public class MasterClientService {
}
@Override
- public int compareTo(setMasterGoalState_args other) {
+ public int compareTo(setManagerGoalState_args other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
@@ -11774,7 +11775,7 @@ public class MasterClientService {
@Override
public java.lang.String toString() {
- java.lang.StringBuilder sb = new java.lang.StringBuilder("setMasterGoalState_args(");
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("setManagerGoalState_args(");
boolean first = true;
sb.append("tinfo:");
@@ -11831,15 +11832,15 @@ public class MasterClientService {
}
}
- private static class setMasterGoalState_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
- public setMasterGoalState_argsStandardScheme getScheme() {
- return new setMasterGoalState_argsStandardScheme();
+ private static class setManagerGoalState_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ public setManagerGoalState_argsStandardScheme getScheme() {
+ return new setManagerGoalState_argsStandardScheme();
}
}
- private static class setMasterGoalState_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setMasterGoalState_args> {
+ private static class setManagerGoalState_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setManagerGoalState_args> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, setMasterGoalState_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, setManagerGoalState_args struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -11869,7 +11870,7 @@ public class MasterClientService {
break;
case 2: // STATE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.state = org.apache.accumulo.core.master.thrift.MasterGoalState.findByValue(iprot.readI32());
+ struct.state = ManagerGoalState.findByValue(iprot.readI32());
struct.setStateIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -11886,7 +11887,7 @@ public class MasterClientService {
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, setMasterGoalState_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, setManagerGoalState_args struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -11911,16 +11912,16 @@ public class MasterClientService {
}
- private static class setMasterGoalState_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
- public setMasterGoalState_argsTupleScheme getScheme() {
- return new setMasterGoalState_argsTupleScheme();
+ private static class setManagerGoalState_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ public setManagerGoalState_argsTupleScheme getScheme() {
+ return new setManagerGoalState_argsTupleScheme();
}
}
- private static class setMasterGoalState_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setMasterGoalState_args> {
+ private static class setManagerGoalState_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setManagerGoalState_args> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, setMasterGoalState_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_args struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetTinfo()) {
@@ -11945,7 +11946,7 @@ public class MasterClientService {
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, setMasterGoalState_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_args struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
java.util.BitSet incoming = iprot.readBitSet(3);
if (incoming.get(0)) {
@@ -11959,7 +11960,7 @@ public class MasterClientService {
struct.setCredentialsIsSet(true);
}
if (incoming.get(2)) {
- struct.state = org.apache.accumulo.core.master.thrift.MasterGoalState.findByValue(iprot.readI32());
+ struct.state = ManagerGoalState.findByValue(iprot.readI32());
struct.setStateIsSet(true);
}
}
@@ -11970,14 +11971,14 @@ public class MasterClientService {
}
}
- public static class setMasterGoalState_result implements org.apache.thrift.TBase<setMasterGoalState_result, setMasterGoalState_result._Fields>, java.io.Serializable, Cloneable, Comparable<setMasterGoalState_result> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setMasterGoalState_result");
+ public static class setManagerGoalState_result implements org.apache.thrift.TBase<setManagerGoalState_result, setManagerGoalState_result._Fields>, java.io.Serializable, Cloneable, Comparable<setManagerGoalState_result> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setManagerGoalState_result");
private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2);
- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setMasterGoalState_resultStandardSchemeFactory();
- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setMasterGoalState_resultTupleSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setManagerGoalState_resultStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setManagerGoalState_resultTupleSchemeFactory();
public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required
public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required
@@ -12054,13 +12055,13 @@ public class MasterClientService {
tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class)));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setMasterGoalState_result.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setManagerGoalState_result.class, metaDataMap);
}
- public setMasterGoalState_result() {
+ public setManagerGoalState_result() {
}
- public setMasterGoalState_result(
+ public setManagerGoalState_result(
org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec,
org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase)
{
@@ -12072,7 +12073,7 @@ public class MasterClientService {
/**
* Performs a deep copy on <i>other</i>.
*/
- public setMasterGoalState_result(setMasterGoalState_result other) {
+ public setManagerGoalState_result(setManagerGoalState_result other) {
if (other.isSetSec()) {
this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec);
}
@@ -12081,8 +12082,8 @@ public class MasterClientService {
}
}
- public setMasterGoalState_result deepCopy() {
- return new setMasterGoalState_result(this);
+ public setManagerGoalState_result deepCopy() {
+ return new setManagerGoalState_result(this);
}
@Override
@@ -12096,7 +12097,7 @@ public class MasterClientService {
return this.sec;
}
- public setMasterGoalState_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
+ public setManagerGoalState_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
this.sec = sec;
return this;
}
@@ -12121,7 +12122,7 @@ public class MasterClientService {
return this.tnase;
}
- public setMasterGoalState_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
+ public setManagerGoalState_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
this.tnase = tnase;
return this;
}
@@ -12194,12 +12195,12 @@ public class MasterClientService {
public boolean equals(java.lang.Object that) {
if (that == null)
return false;
- if (that instanceof setMasterGoalState_result)
- return this.equals((setMasterGoalState_result)that);
+ if (that instanceof setManagerGoalState_result)
+ return this.equals((setManagerGoalState_result)that);
return false;
}
- public boolean equals(setMasterGoalState_result that) {
+ public boolean equals(setManagerGoalState_result that) {
if (that == null)
return false;
if (this == that)
@@ -12242,7 +12243,7 @@ public class MasterClientService {
}
@Override
- public int compareTo(setMasterGoalState_result other) {
+ public int compareTo(setManagerGoalState_result other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
@@ -12287,7 +12288,7 @@ public class MasterClientService {
@Override
public java.lang.String toString() {
- java.lang.StringBuilder sb = new java.lang.StringBuilder("setMasterGoalState_result(");
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("setManagerGoalState_result(");
boolean first = true;
sb.append("sec:");
@@ -12330,15 +12331,15 @@ public class MasterClientService {
}
}
- private static class setMasterGoalState_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
- public setMasterGoalState_resultStandardScheme getScheme() {
- return new setMasterGoalState_resultStandardScheme();
+ private static class setManagerGoalState_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ public setManagerGoalState_resultStandardScheme getScheme() {
+ return new setManagerGoalState_resultStandardScheme();
}
}
- private static class setMasterGoalState_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setMasterGoalState_result> {
+ private static class setManagerGoalState_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setManagerGoalState_result> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, setMasterGoalState_result struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, setManagerGoalState_result struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -12377,7 +12378,7 @@ public class MasterClientService {
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, setMasterGoalState_result struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, setManagerGoalState_result struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -12397,16 +12398,16 @@ public class MasterClientService {
}
- private static class setMasterGoalState_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
- public setMasterGoalState_resultTupleScheme getScheme() {
- return new setMasterGoalState_resultTupleScheme();
+ private static class setManagerGoalState_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ public setManagerGoalState_resultTupleScheme getScheme() {
+ return new setManagerGoalState_resultTupleScheme();
}
}
- private static class setMasterGoalState_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setMasterGoalState_result> {
+ private static class setManagerGoalState_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setManagerGoalState_result> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, setMasterGoalState_result struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_result struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetSec()) {
@@ -12425,7 +12426,7 @@ public class MasterClientService {
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, setMasterGoalState_result struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_result struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
java.util.BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
@@ -16898,14 +16899,14 @@ public class MasterClientService {
}
}
- public static class getMasterStats_args implements org.apache.thrift.TBase<getMasterStats_args, getMasterStats_args._Fields>, java.io.Serializable, Cloneable, Comparable<getMasterStats_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMasterStats_args");
+ public static class getManagerStats_args implements org.apache.thrift.TBase<getManagerStats_args, getManagerStats_args._Fields>, java.io.Serializable, Cloneable, Comparable<getManagerStats_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getManagerStats_args");
private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)2);
private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)1);
- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getMasterStats_argsStandardSchemeFactory();
- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getMasterStats_argsTupleSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getManagerStats_argsStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getManagerStats_argsTupleSchemeFactory();
public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.trace.thrift.TInfo tinfo; // required
public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required
@@ -16982,13 +16983,13 @@ public class MasterClientService {
tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class)));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getMasterStats_args.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getManagerStats_args.class, metaDataMap);
}
- public getMasterStats_args() {
+ public getManagerStats_args() {
}
- public getMasterStats_args(
+ public getManagerStats_args(
org.apache.accumulo.core.trace.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials)
{
@@ -17000,7 +17001,7 @@ public class MasterClientService {
/**
* Performs a deep copy on <i>other</i>.
*/
- public getMasterStats_args(getMasterStats_args other) {
+ public getManagerStats_args(getManagerStats_args other) {
if (other.isSetTinfo()) {
this.tinfo = new org.apache.accumulo.core.trace.thrift.TInfo(other.tinfo);
}
@@ -17009,8 +17010,8 @@ public class MasterClientService {
}
}
- public getMasterStats_args deepCopy() {
- return new getMasterStats_args(this);
+ public getManagerStats_args deepCopy() {
+ return new getManagerStats_args(this);
}
@Override
@@ -17024,7 +17025,7 @@ public class MasterClientService {
return this.tinfo;
}
- public getMasterStats_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.trace.thrift.TInfo tinfo) {
+ public getManagerStats_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.trace.thrift.TInfo tinfo) {
this.tinfo = tinfo;
return this;
}
@@ -17049,7 +17050,7 @@ public class MasterClientService {
return this.credentials;
}
- public getMasterStats_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
+ public getManagerStats_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
this.credentials = credentials;
return this;
}
@@ -17122,12 +17123,12 @@ public class MasterClientService {
public boolean equals(java.lang.Object that) {
if (that == null)
return false;
- if (that instanceof getMasterStats_args)
- return this.equals((getMasterStats_args)that);
+ if (that instanceof getManagerStats_args)
+ return this.equals((getManagerStats_args)that);
return false;
}
- public boolean equals(getMasterStats_args that) {
+ public boolean equals(getManagerStats_args that) {
if (that == null)
return false;
if (this == that)
@@ -17170,7 +17171,7 @@ public class MasterClientService {
}
@Override
- public int compareTo(getMasterStats_args other) {
+ public int compareTo(getManagerStats_args other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
@@ -17215,7 +17216,7 @@ public class MasterClientService {
@Override
public java.lang.String toString() {
- java.lang.StringBuilder sb = new java.lang.StringBuilder("getMasterStats_args(");
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("getManagerStats_args(");
boolean first = true;
sb.append("tinfo:");
@@ -17264,15 +17265,15 @@ public class MasterClientService {
}
}
- private static class getMasterStats_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
- public getMasterStats_argsStandardScheme getScheme() {
- return new getMasterStats_argsStandardScheme();
+ private static class getManagerStats_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ public getManagerStats_argsStandardScheme getScheme() {
+ return new getManagerStats_argsStandardScheme();
}
}
- private static class getMasterStats_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getMasterStats_args> {
+ private static class getManagerStats_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getManagerStats_args> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, getMasterStats_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, getManagerStats_args struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -17311,7 +17312,7 @@ public class MasterClientService {
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, getMasterStats_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, getManagerStats_args struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -17331,16 +17332,16 @@ public class MasterClientService {
}
- private static class getMasterStats_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
- public getMasterStats_argsTupleScheme getScheme() {
- return new getMasterStats_argsTupleScheme();
+ private static class getManagerStats_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ public getManagerStats_argsTupleScheme getScheme() {
+ return new getManagerStats_argsTupleScheme();
}
}
- private static class getMasterStats_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getMasterStats_args> {
+ private static class getManagerStats_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getManagerStats_args> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, getMasterStats_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, getManagerStats_args struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetTinfo()) {
@@ -17359,7 +17360,7 @@ public class MasterClientService {
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, getMasterStats_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, getManagerStats_args struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
java.util.BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
@@ -17380,17 +17381,17 @@ public class MasterClientService {
}
}
- public static class getMasterStats_result implements org.apache.thrift.TBase<getMasterStats_result, getMasterStats_result._Fields>, java.io.Serializable, Cloneable, Comparable<getMasterStats_result> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMasterStats_result");
+ public static class getManagerStats_result implements org.apache.thrift.TBase<getManagerStats_result, getManagerStats_result._Fields>, java.io.Serializable, Cloneable, Comparable<getManagerStats_result> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getManagerStats_result");
private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2);
- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getMasterStats_resultStandardSchemeFactory();
- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getMasterStats_resultTupleSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getManagerStats_resultStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getManagerStats_resultTupleSchemeFactory();
- public @org.apache.thrift.annotation.Nullable MasterMonitorInfo success; // required
+ public @org.apache.thrift.annotation.Nullable ManagerMonitorInfo success; // required
public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required
public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required
@@ -17465,20 +17466,20 @@ public class MasterClientService {
static {
java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MasterMonitorInfo.class)));
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ManagerMonitorInfo.class)));
tmpMap.put(_Fields.SEC, new org.apache.thrift.meta_data.FieldMetaData("sec", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException.class)));
tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class)));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getMasterStats_result.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getManagerStats_result.class, metaDataMap);
}
- public getMasterStats_result() {
+ public getManagerStats_result() {
}
- public getMasterStats_result(
- MasterMonitorInfo success,
+ public getManagerStats_result(
+ ManagerMonitorInfo success,
org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec,
org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase)
{
@@ -17491,9 +17492,9 @@ public class MasterClientService {
/**
* Performs a deep copy on <i>other</i>.
*/
- public getMasterStats_result(getMasterStats_result other) {
+ public getManagerStats_result(getManagerStats_result other) {
if (other.isSetSuccess()) {
- this.success = new MasterMonitorInfo(other.success);
+ this.success = new ManagerMonitorInfo(other.success);
}
if (other.isSetSec()) {
this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec);
@@ -17503,8 +17504,8 @@ public class MasterClientService {
}
}
- public getMasterStats_result deepCopy() {
- return new getMasterStats_result(this);
+ public getManagerStats_result deepCopy() {
+ return new getManagerStats_result(this);
}
@Override
@@ -17515,11 +17516,12 @@ public class MasterClientService {
}
@org.apache.thrift.annotation.Nullable
- public MasterMonitorInfo getSuccess() {
+ public ManagerMonitorInfo getSuccess() {
return this.success;
}
- public getMasterStats_result setSuccess(@org.apache.thrift.annotation.Nullable MasterMonitorInfo success) {
+ public getManagerStats_result setSuccess(@org.apache.thrift.annotation.Nullable
+ ManagerMonitorInfo success) {
this.success = success;
return this;
}
@@ -17544,7 +17546,7 @@ public class MasterClientService {
return this.sec;
}
- public getMasterStats_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
+ public getManagerStats_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
this.sec = sec;
return this;
}
@@ -17569,7 +17571,7 @@ public class MasterClientService {
return this.tnase;
}
- public getMasterStats_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
+ public getManagerStats_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
this.tnase = tnase;
return this;
}
@@ -17595,7 +17597,7 @@ public class MasterClientService {
if (value == null) {
unsetSuccess();
} else {
- setSuccess((MasterMonitorInfo)value);
+ setSuccess((ManagerMonitorInfo)value);
}
break;
@@ -17655,12 +17657,12 @@ public class MasterClientService {
public boolean equals(java.lang.Object that) {
if (that == null)
return false;
- if (that instanceof getMasterStats_result)
- return this.equals((getMasterStats_result)that);
+ if (that instanceof getManagerStats_result)
+ return this.equals((getManagerStats_result)that);
return false;
}
- public boolean equals(getMasterStats_result that) {
+ public boolean equals(getManagerStats_result that) {
if (that == null)
return false;
if (this == that)
@@ -17716,7 +17718,7 @@ public class MasterClientService {
}
@Override
- public int compareTo(getMasterStats_result other) {
+ public int compareTo(getManagerStats_result other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
@@ -17771,7 +17773,7 @@ public class MasterClientService {
@Override
public java.lang.String toString() {
- java.lang.StringBuilder sb = new java.lang.StringBuilder("getMasterStats_result(");
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("getManagerStats_result(");
boolean first = true;
sb.append("success:");
@@ -17825,15 +17827,15 @@ public class MasterClientService {
}
}
- private static class getMasterStats_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
- public getMasterStats_resultStandardScheme getScheme() {
- return new getMasterStats_resultStandardScheme();
+ private static class getManagerStats_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ public getManagerStats_resultStandardScheme getScheme() {
+ return new getManagerStats_resultStandardScheme();
}
}
- private static class getMasterStats_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getMasterStats_result> {
+ private static class getManagerStats_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getManagerStats_result> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, getMasterStats_result struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, getManagerStats_result struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -17845,7 +17847,7 @@ public class MasterClientService {
switch (schemeField.id) {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.success = new MasterMonitorInfo();
+ struct.success = new ManagerMonitorInfo();
struct.success.read(iprot);
struct.setSuccessIsSet(true);
} else {
@@ -17881,7 +17883,7 @@ public class MasterClientService {
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, getMasterStats_result struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, getManagerStats_result struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -17906,16 +17908,16 @@ public class MasterClientService {
}
- private static class getMasterStats_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
- public getMasterStats_resultTupleScheme getScheme() {
- return new getMasterStats_resultTupleScheme();
+ private static class getManagerStats_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ public getManagerStats_resultTupleScheme getScheme() {
+ return new getManagerStats_resultTupleScheme();
}
}
- private static class getMasterStats_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getMasterStats_result> {
+ private static class getManagerStats_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getManagerStats_result> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, getMasterStats_result struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, getManagerStats_result struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetSuccess()) {
@@ -17940,11 +17942,11 @@ public class MasterClientService {
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, getMasterStats_result struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, getManagerStats_result struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
java.util.BitSet incoming = iprot.readBitSet(3);
if (incoming.get(0)) {
- struct.success = new MasterMonitorInfo();
+ struct.success = new ManagerMonitorInfo();
struct.success.read(iprot);
struct.setSuccessIsSet(true);
}
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/ManagerGoalState.java
similarity index 90%
rename from core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
rename to core/src/main/java/org/apache/accumulo/core/master/thrift/ManagerGoalState.java
index b957bfe..8d6386d 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/ManagerGoalState.java
@@ -25,14 +25,14 @@
package org.apache.accumulo.core.master.thrift;
-public enum MasterGoalState implements org.apache.thrift.TEnum {
+public enum ManagerGoalState implements org.apache.thrift.TEnum {
CLEAN_STOP(0),
SAFE_MODE(1),
NORMAL(2);
private final int value;
- private MasterGoalState(int value) {
+ private ManagerGoalState(int value) {
this.value = value;
}
@@ -48,7 +48,7 @@ public enum MasterGoalState implements org.apache.thrift.TEnum {
* @return null if the value is not found.
*/
@org.apache.thrift.annotation.Nullable
- public static MasterGoalState findByValue(int value) {
+ public static ManagerGoalState findByValue(int value) {
switch (value) {
case 0:
return CLEAN_STOP;
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/ManagerMonitorInfo.java
similarity index 93%
rename from core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
rename to core/src/main/java/org/apache/accumulo/core/master/thrift/ManagerMonitorInfo.java
index 5f10b6c..be21cc5 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/ManagerMonitorInfo.java
@@ -25,8 +25,9 @@
package org.apache.accumulo.core.master.thrift;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorInfo, MasterMonitorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<MasterMonitorInfo> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MasterMonitorInfo");
+public class ManagerMonitorInfo
+ implements org.apache.thrift.TBase<ManagerMonitorInfo, ManagerMonitorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ManagerMonitorInfo> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ManagerMonitorInfo");
private static final org.apache.thrift.protocol.TField TABLE_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("tableMap", org.apache.thrift.protocol.TType.MAP, (short)1);
private static final org.apache.thrift.protocol.TField T_SERVER_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tServerInfo", org.apache.thrift.protocol.TType.LIST, (short)2);
@@ -38,22 +39,22 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
private static final org.apache.thrift.protocol.TField DEAD_TABLET_SERVERS_FIELD_DESC = new org.apache.thrift.protocol.TField("deadTabletServers", org.apache.thrift.protocol.TType.LIST, (short)10);
private static final org.apache.thrift.protocol.TField BULK_IMPORTS_FIELD_DESC = new org.apache.thrift.protocol.TField("bulkImports", org.apache.thrift.protocol.TType.LIST, (short)11);
- private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new MasterMonitorInfoStandardSchemeFactory();
- private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new MasterMonitorInfoTupleSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ManagerMonitorInfoStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ManagerMonitorInfoTupleSchemeFactory();
public @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,TableInfo> tableMap; // required
public @org.apache.thrift.annotation.Nullable java.util.List<TabletServerStatus> tServerInfo; // required
public @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.Byte> badTServers; // required
/**
*
- * @see MasterState
+ * @see ManagerState
*/
- public @org.apache.thrift.annotation.Nullable MasterState state; // required
+ public @org.apache.thrift.annotation.Nullable ManagerState state; // required
/**
*
- * @see MasterGoalState
+ * @see ManagerGoalState
*/
- public @org.apache.thrift.annotation.Nullable MasterGoalState goalState; // required
+ public @org.apache.thrift.annotation.Nullable ManagerGoalState goalState; // required
public int unassignedTablets; // required
public @org.apache.thrift.annotation.Nullable java.util.Set<java.lang.String> serversShuttingDown; // required
public @org.apache.thrift.annotation.Nullable java.util.List<DeadServer> deadTabletServers; // required
@@ -66,12 +67,12 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
BAD_TSERVERS((short)3, "badTServers"),
/**
*
- * @see MasterState
+ * @see ManagerState
*/
STATE((short)6, "state"),
/**
*
- * @see MasterGoalState
+ * @see ManagerGoalState
*/
GOAL_STATE((short)8, "goalState"),
UNASSIGNED_TABLETS((short)7, "unassignedTablets"),
@@ -169,9 +170,9 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE))));
tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, MasterState.class)));
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ManagerState.class)));
tmpMap.put(_Fields.GOAL_STATE, new org.apache.thrift.meta_data.FieldMetaData("goalState", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, MasterGoalState.class)));
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ManagerGoalState.class)));
tmpMap.put(_Fields.UNASSIGNED_TABLETS, new org.apache.thrift.meta_data.FieldMetaData("unassignedTablets", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.SERVERS_SHUTTING_DOWN, new org.apache.thrift.meta_data.FieldMetaData("serversShuttingDown", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -184,18 +185,18 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, BulkImportStatus.class))));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(MasterMonitorInfo.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ManagerMonitorInfo.class, metaDataMap);
}
- public MasterMonitorInfo() {
+ public ManagerMonitorInfo() {
}
- public MasterMonitorInfo(
+ public ManagerMonitorInfo(
java.util.Map<java.lang.String,TableInfo> tableMap,
java.util.List<TabletServerStatus> tServerInfo,
java.util.Map<java.lang.String,java.lang.Byte> badTServers,
- MasterState state,
- MasterGoalState goalState,
+ ManagerState state,
+ ManagerGoalState goalState,
int unassignedTablets,
java.util.Set<java.lang.String> serversShuttingDown,
java.util.List<DeadServer> deadTabletServers,
@@ -217,7 +218,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
/**
* Performs a deep copy on <i>other</i>.
*/
- public MasterMonitorInfo(MasterMonitorInfo other) {
+ public ManagerMonitorInfo(ManagerMonitorInfo other) {
__isset_bitfield = other.__isset_bitfield;
if (other.isSetTableMap()) {
java.util.Map<java.lang.String,TableInfo> __this__tableMap = new java.util.HashMap<java.lang.String,TableInfo>(other.tableMap.size());
@@ -272,8 +273,8 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
}
}
- public MasterMonitorInfo deepCopy() {
- return new MasterMonitorInfo(this);
+ public ManagerMonitorInfo deepCopy() {
+ return new ManagerMonitorInfo(this);
}
@Override
@@ -306,7 +307,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
return this.tableMap;
}
- public MasterMonitorInfo setTableMap(@org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,TableInfo> tableMap) {
+ public ManagerMonitorInfo setTableMap(@org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,TableInfo> tableMap) {
this.tableMap = tableMap;
return this;
}
@@ -347,7 +348,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
return this.tServerInfo;
}
- public MasterMonitorInfo setTServerInfo(@org.apache.thrift.annotation.Nullable java.util.List<TabletServerStatus> tServerInfo) {
+ public ManagerMonitorInfo setTServerInfo(@org.apache.thrift.annotation.Nullable java.util.List<TabletServerStatus> tServerInfo) {
this.tServerInfo = tServerInfo;
return this;
}
@@ -383,7 +384,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
return this.badTServers;
}
- public MasterMonitorInfo setBadTServers(@org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.Byte> badTServers) {
+ public ManagerMonitorInfo setBadTServers(@org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.Byte> badTServers) {
this.badTServers = badTServers;
return this;
}
@@ -405,18 +406,18 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
/**
*
- * @see MasterState
+ * @see ManagerState
*/
@org.apache.thrift.annotation.Nullable
- public MasterState getState() {
+ public ManagerState getState() {
return this.state;
}
/**
*
- * @see MasterState
+ * @see ManagerState
*/
- public MasterMonitorInfo setState(@org.apache.thrift.annotation.Nullable MasterState state) {
+ public ManagerMonitorInfo setState(@org.apache.thrift.annotation.Nullable ManagerState state) {
this.state = state;
return this;
}
@@ -438,18 +439,19 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
/**
*
- * @see MasterGoalState
+ * @see ManagerGoalState
*/
@org.apache.thrift.annotation.Nullable
- public MasterGoalState getGoalState() {
+ public ManagerGoalState getGoalState() {
return this.goalState;
}
/**
*
- * @see MasterGoalState
+ * @see ManagerGoalState
*/
- public MasterMonitorInfo setGoalState(@org.apache.thrift.annotation.Nullable MasterGoalState goalState) {
+ public ManagerMonitorInfo setGoalState(@org.apache.thrift.annotation.Nullable
+ ManagerGoalState goalState) {
this.goalState = goalState;
return this;
}
@@ -473,7 +475,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
return this.unassignedTablets;
}
- public MasterMonitorInfo setUnassignedTablets(int unassignedTablets) {
+ public ManagerMonitorInfo setUnassignedTablets(int unassignedTablets) {
this.unassignedTablets = unassignedTablets;
setUnassignedTabletsIsSet(true);
return this;
@@ -513,7 +515,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
return this.serversShuttingDown;
}
- public MasterMonitorInfo setServersShuttingDown(@org.apache.thrift.annotation.Nullable java.util.Set<java.lang.String> serversShuttingDown) {
+ public ManagerMonitorInfo setServersShuttingDown(@org.apache.thrift.annotation.Nullable java.util.Set<java.lang.String> serversShuttingDown) {
this.serversShuttingDown = serversShuttingDown;
return this;
}
@@ -554,7 +556,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
return this.deadTabletServers;
}
- public MasterMonitorInfo setDeadTabletServers(@org.apache.thrift.annotation.Nullable java.util.List<DeadServer> deadTabletServers) {
+ public ManagerMonitorInfo setDeadTabletServers(@org.apache.thrift.annotation.Nullable java.util.List<DeadServer> deadTabletServers) {
this.deadTabletServers = deadTabletServers;
return this;
}
@@ -595,7 +597,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
return this.bulkImports;
}
- public MasterMonitorInfo setBulkImports(@org.apache.thrift.annotation.Nullable java.util.List<BulkImportStatus> bulkImports) {
+ public ManagerMonitorInfo setBulkImports(@org.apache.thrift.annotation.Nullable java.util.List<BulkImportStatus> bulkImports) {
this.bulkImports = bulkImports;
return this;
}
@@ -645,7 +647,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
if (value == null) {
unsetState();
} else {
- setState((MasterState)value);
+ setState((ManagerState)value);
}
break;
@@ -653,7 +655,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
if (value == null) {
unsetGoalState();
} else {
- setGoalState((MasterGoalState)value);
+ setGoalState((ManagerGoalState)value);
}
break;
@@ -759,12 +761,12 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
public boolean equals(java.lang.Object that) {
if (that == null)
return false;
- if (that instanceof MasterMonitorInfo)
- return this.equals((MasterMonitorInfo)that);
+ if (that instanceof ManagerMonitorInfo)
+ return this.equals((ManagerMonitorInfo)that);
return false;
}
- public boolean equals(MasterMonitorInfo that) {
+ public boolean equals(ManagerMonitorInfo that) {
if (that == null)
return false;
if (this == that)
@@ -896,7 +898,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
}
@Override
- public int compareTo(MasterMonitorInfo other) {
+ public int compareTo(ManagerMonitorInfo other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
@@ -1011,7 +1013,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
@Override
public java.lang.String toString() {
- java.lang.StringBuilder sb = new java.lang.StringBuilder("MasterMonitorInfo(");
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("ManagerMonitorInfo(");
boolean first = true;
sb.append("tableMap:");
@@ -1108,15 +1110,15 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
}
}
- private static class MasterMonitorInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
- public MasterMonitorInfoStandardScheme getScheme() {
- return new MasterMonitorInfoStandardScheme();
+ private static class ManagerMonitorInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ public ManagerMonitorInfoStandardScheme getScheme() {
+ return new ManagerMonitorInfoStandardScheme();
}
}
- private static class MasterMonitorInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<MasterMonitorInfo> {
+ private static class ManagerMonitorInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<ManagerMonitorInfo> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, MasterMonitorInfo struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ManagerMonitorInfo struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -1188,7 +1190,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
break;
case 6: // STATE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.state = org.apache.accumulo.core.master.thrift.MasterState.findByValue(iprot.readI32());
+ struct.state = ManagerState.findByValue(iprot.readI32());
struct.setStateIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1196,7 +1198,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
break;
case 8: // GOAL_STATE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.goalState = org.apache.accumulo.core.master.thrift.MasterGoalState.findByValue(iprot.readI32());
+ struct.goalState = ManagerGoalState.findByValue(iprot.readI32());
struct.setGoalStateIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1277,7 +1279,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, MasterMonitorInfo struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, ManagerMonitorInfo struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -1374,16 +1376,16 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
}
- private static class MasterMonitorInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
- public MasterMonitorInfoTupleScheme getScheme() {
- return new MasterMonitorInfoTupleScheme();
+ private static class ManagerMonitorInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ public ManagerMonitorInfoTupleScheme getScheme() {
+ return new ManagerMonitorInfoTupleScheme();
}
}
- private static class MasterMonitorInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<MasterMonitorInfo> {
+ private static class ManagerMonitorInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<ManagerMonitorInfo> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, MasterMonitorInfo struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, ManagerMonitorInfo struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetTableMap()) {
@@ -1482,7 +1484,7 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, MasterMonitorInfo struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, ManagerMonitorInfo struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
java.util.BitSet incoming = iprot.readBitSet(9);
if (incoming.get(0)) {
@@ -1531,11 +1533,11 @@ public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorI
struct.setBadTServersIsSet(true);
}
if (incoming.get(3)) {
- struct.state = org.apache.accumulo.core.master.thrift.MasterState.findByValue(iprot.readI32());
+ struct.state = ManagerState.findByValue(iprot.readI32());
struct.setStateIsSet(true);
}
if (incoming.get(4)) {
- struct.goalState = org.apache.accumulo.core.master.thrift.MasterGoalState.findByValue(iprot.readI32());
+ struct.goalState = ManagerGoalState.findByValue(iprot.readI32());
struct.setGoalStateIsSet(true);
}
if (incoming.get(5)) {
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/ManagerState.java
similarity index 92%
rename from core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java
rename to core/src/main/java/org/apache/accumulo/core/master/thrift/ManagerState.java
index 9c4efbf..2580c80 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/ManagerState.java
@@ -25,7 +25,7 @@
package org.apache.accumulo.core.master.thrift;
-public enum MasterState implements org.apache.thrift.TEnum {
+public enum ManagerState implements org.apache.thrift.TEnum {
INITIAL(0),
HAVE_LOCK(1),
SAFE_MODE(2),
@@ -36,7 +36,7 @@ public enum MasterState implements org.apache.thrift.TEnum {
private final int value;
- private MasterState(int value) {
+ private ManagerState(int value) {
this.value = value;
}
@@ -52,7 +52,7 @@ public enum MasterState implements org.apache.thrift.TEnum {
* @return null if the value is not found.
*/
@org.apache.thrift.annotation.Nullable
- public static MasterState findByValue(int value) {
+ public static ManagerState findByValue(int value) {
switch (value) {
case 0:
return INITIAL;
diff --git a/core/src/main/scripts/generate-thrift.sh b/core/src/main/scripts/generate-thrift.sh
index 9ba47b8..58b3b24 100755
--- a/core/src/main/scripts/generate-thrift.sh
+++ b/core/src/main/scripts/generate-thrift.sh
@@ -32,7 +32,7 @@
[[ -z $REQUIRED_THRIFT_VERSION ]] && REQUIRED_THRIFT_VERSION='0.12.0'
[[ -z $INCLUDED_MODULES ]] && INCLUDED_MODULES=(../server/tracer)
[[ -z $BASE_OUTPUT_PACKAGE ]] && BASE_OUTPUT_PACKAGE='org.apache.accumulo.core'
-[[ -z $PACKAGES_TO_GENERATE ]] && PACKAGES_TO_GENERATE=(gc master tabletserver securityImpl clientImpl dataImpl replication trace)
+[[ -z $PACKAGES_TO_GENERATE ]] && PACKAGES_TO_GENERATE=(gc manager tabletserver securityImpl clientImpl dataImpl replication trace)
[[ -z $BUILD_DIR ]] && BUILD_DIR='target'
[[ -z $LANGUAGES_TO_GENERATE ]] && LANGUAGES_TO_GENERATE=(java)
[[ -z $FINAL_DIR ]] && FINAL_DIR='src/main'
diff --git a/core/src/main/thrift/master.thrift b/core/src/main/thrift/manager.thrift
similarity index 95%
rename from core/src/main/thrift/master.thrift
rename to core/src/main/thrift/manager.thrift
index d161b3f..8279aa1 100644
--- a/core/src/main/thrift/master.thrift
+++ b/core/src/main/thrift/manager.thrift
@@ -53,7 +53,7 @@ struct RecoveryStatus {
enum BulkImportState {
INITIAL
- // master moves the files into the accumulo area
+ // manager moves the files into the accumulo area
MOVING
// tserver examines the index of the file
PROCESSING
@@ -61,7 +61,7 @@ enum BulkImportState {
ASSIGNING
// tserver incorporates file into tablet
LOADING
- // master moves error files into the error directory
+ // manager moves error files into the error directory
COPY_FILES
// flags and locks removed
CLEANUP
@@ -92,7 +92,7 @@ struct TabletServerStatus {
18:i64 responseTime
}
-enum MasterState {
+enum ManagerState {
INITIAL
HAVE_LOCK
SAFE_MODE
@@ -102,7 +102,7 @@ enum MasterState {
STOP
}
-enum MasterGoalState {
+enum ManagerGoalState {
CLEAN_STOP
SAFE_MODE
NORMAL
@@ -114,12 +114,12 @@ struct DeadServer {
3:string status
}
-struct MasterMonitorInfo {
+struct ManagerMonitorInfo {
1:map<string, TableInfo> tableMap
2:list<TabletServerStatus> tServerInfo
3:map<string, i8> badTServers
- 6:MasterState state
- 8:MasterGoalState goalState
+ 6:ManagerState state
+ 8:ManagerGoalState goalState
7:i32 unassignedTablets
9:set<string> serversShuttingDown
10:list<DeadServer> deadTabletServers
@@ -213,7 +213,7 @@ service FateService {
}
-service MasterClientService extends FateService {
+service ManagerClientService extends FateService {
// table management methods
i64 initiateFlush(
@@ -287,10 +287,10 @@ service MasterClientService extends FateService {
)
// system management methods
- void setMasterGoalState(
+ void setManagerGoalState(
3:trace.TInfo tinfo
1:security.TCredentials credentials
- 2:MasterGoalState state
+ 2:ManagerGoalState state
) throws (
1:client.ThriftSecurityException sec
2:client.ThriftNotActiveServiceException tnase
@@ -335,7 +335,7 @@ service MasterClientService extends FateService {
)
// system monitoring methods
- MasterMonitorInfo getMasterStats(
+ ManagerMonitorInfo getManagerStats(
2:trace.TInfo tinfo
1:security.TCredentials credentials
) throws (
diff --git a/core/src/main/thrift/tabletserver.thrift b/core/src/main/thrift/tabletserver.thrift
index 55c9269..2546ca3 100644
--- a/core/src/main/thrift/tabletserver.thrift
+++ b/core/src/main/thrift/tabletserver.thrift
@@ -22,7 +22,7 @@ namespace cpp org.apache.accumulo.core.tabletserver.thrift
include "data.thrift"
include "security.thrift"
include "client.thrift"
-include "master.thrift"
+include "manager.thrift"
include "trace.thrift"
exception NotServingTabletException {
@@ -64,7 +64,7 @@ struct TabletStats {
5:i64 numEntries
6:double ingestRate
7:double queryRate
- // zero if loaded by the master, currentTimeMillis when the split was created
+ // zero if loaded by the manager, currentTimeMillis when the split was created
8:i64 splitCreationTime
}
@@ -380,7 +380,7 @@ service TabletClientService extends client.ClientService {
6:binary endRow
)
- master.TabletServerStatus getTabletServerStatus(
+ manager.TabletServerStatus getTabletServerStatus(
3:trace.TInfo tinfo
1:security.TCredentials credentials
) throws (
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java b/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java
index b662b81..30f99dd 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/ConfigSanityCheckTest.java
@@ -36,7 +36,7 @@ public class ConfigSanityCheckTest {
public void testPass() {
m.put(Property.MANAGER_CLIENTPORT.getKey(), "9999");
m.put(Property.MANAGER_TABLET_BALANCER.getKey(),
- "org.apache.accumulo.server.master.balancer.TableLoadBalancer");
+ "org.apache.accumulo.server.manager.balancer.TableLoadBalancer");
m.put(Property.MANAGER_BULK_RETRIES.getKey(), "3");
ConfigSanityCheck.validate(m.entrySet());
}
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
index 23cc29d..6d5217e 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
@@ -38,7 +38,7 @@ import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.ConfigurationCopy;
import org.apache.accumulo.core.conf.SiteConfiguration;
-import org.apache.accumulo.core.master.thrift.MasterGoalState;
+import org.apache.accumulo.core.master.thrift.ManagerGoalState;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.server.ServerContext;
import org.apache.hadoop.conf.Configuration;
@@ -167,7 +167,7 @@ public class StandaloneAccumuloCluster implements AccumuloCluster {
// TODO We can check the hosts files, but that requires us to be on a host with the
// installation. Limitation at the moment.
- control.setGoalState(MasterGoalState.NORMAL.toString());
+ control.setGoalState(ManagerGoalState.NORMAL.toString());
for (ServerType type : ALL_SERVER_TYPES) {
control.startAllServers(type);
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
index 5608f7f..be531e0 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java
@@ -34,7 +34,7 @@ import java.util.Map.Entry;
import org.apache.accumulo.cluster.ClusterControl;
import org.apache.accumulo.cluster.RemoteShell;
import org.apache.accumulo.cluster.RemoteShellOptions;
-import org.apache.accumulo.core.master.thrift.MasterGoalState;
+import org.apache.accumulo.core.master.thrift.ManagerGoalState;
import org.apache.accumulo.manager.state.SetGoalState;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.server.util.Admin;
@@ -150,7 +150,7 @@ public class StandaloneClusterControl implements ClusterControl {
*/
public void setGoalState(String goalState) throws IOException {
requireNonNull(goalState, "Goal state must not be null");
- checkArgument(MasterGoalState.valueOf(goalState) != null, "Unknown goal state: " + goalState);
+ checkArgument(ManagerGoalState.valueOf(goalState) != null, "Unknown goal state: " + goalState);
String master = getHosts(MASTER_HOSTS_FILE).get(0);
String[] cmd = {serverCmdPrefix, accumuloPath, SetGoalState.class.getName(), goalState};
Entry<Integer,String> pair = exec(master, cmd);
diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
index 85e4c3d..fbc16f5 100644
--- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
@@ -31,14 +31,14 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.apache.accumulo.cluster.ClusterControl;
-import org.apache.accumulo.gc.SimpleGarbageCollector;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.gc.GCExecutable;
+import org.apache.accumulo.manager.ManagerExecutable;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl.ProcessInfo;
-import org.apache.accumulo.monitor.Monitor;
+import org.apache.accumulo.monitor.MonitorExecutable;
import org.apache.accumulo.server.util.Admin;
-import org.apache.accumulo.tracer.TraceServer;
-import org.apache.accumulo.tserver.TabletServer;
+import org.apache.accumulo.tracer.TracerExecutable;
+import org.apache.accumulo.tserver.TServerExecutable;
import org.apache.zookeeper.server.ZooKeeperServerMain;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -137,14 +137,15 @@ public class MiniAccumuloClusterControl implements ClusterControl {
for (int i = tabletServerProcesses.size();
count < limit && i < cluster.getConfig().getNumTservers(); i++, ++count) {
tabletServerProcesses
- .add(cluster._exec(TabletServer.class, server, configOverrides).getProcess());
+ .add(cluster._exec(new TServerExecutable(), server, configOverrides).getProcess());
}
}
break;
case MASTER:
case MANAGER:
if (masterProcess == null) {
- masterProcess = cluster._exec(Master.class, server, configOverrides).getProcess();
+ masterProcess =
+ cluster._exec(new ManagerExecutable(), server, configOverrides).getProcess();
}
break;
case ZOOKEEPER:
@@ -155,18 +156,17 @@ public class MiniAccumuloClusterControl implements ClusterControl {
break;
case GARBAGE_COLLECTOR:
if (gcProcess == null) {
- gcProcess =
- cluster._exec(SimpleGarbageCollector.class, server, configOverrides).getProcess();
+ gcProcess = cluster._exec(new GCExecutable(), server, configOverrides).getProcess();
}
break;
case MONITOR:
if (monitor == null) {
- monitor = cluster._exec(Monitor.class, server, configOverrides).getProcess();
+ monitor = cluster._exec(new MonitorExecutable(), server, configOverrides).getProcess();
}
break;
case TRACER:
if (tracer == null) {
- tracer = cluster._exec(TraceServer.class, server, configOverrides).getProcess();
+ tracer = cluster._exec(new TracerExecutable(), server, configOverrides).getProcess();
}
break;
default:
diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
index 1f2a09a..0c605a6 100644
--- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
@@ -49,6 +49,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.stream.Stream;
import org.apache.accumulo.cluster.AccumuloCluster;
import org.apache.accumulo.core.Constants;
@@ -58,7 +59,7 @@ import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.clientImpl.ClientContext;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException;
import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
@@ -67,9 +68,9 @@ import org.apache.accumulo.core.conf.ConfigurationCopy;
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.conf.SiteConfiguration;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
-import org.apache.accumulo.core.master.thrift.MasterGoalState;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
+import org.apache.accumulo.core.master.thrift.ManagerGoalState;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
@@ -86,6 +87,7 @@ import org.apache.accumulo.server.util.AccumuloStatus;
import org.apache.accumulo.server.util.PortUtils;
import org.apache.accumulo.start.Main;
import org.apache.accumulo.start.classloader.vfs.MiniDFSUtil;
+import org.apache.accumulo.start.spi.KeywordExecutable;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
@@ -264,6 +266,18 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
return new ProcessInfo(process, stdOut);
}
+ public ProcessInfo _exec(KeywordExecutable server, ServerType serverType,
+ Map<String,String> configOverrides, String... args) throws IOException {
+ String[] modifiedArgs;
+ if (args == null || args.length == 0) {
+ modifiedArgs = new String[] {server.keyword()};
+ } else {
+ modifiedArgs =
+ Stream.concat(Stream.of(server.keyword()), Stream.of(args)).toArray(String[]::new);
+ }
+ return _exec(Main.class, serverType, configOverrides, modifiedArgs);
+ }
+
public ProcessInfo _exec(Class<?> clazz, ServerType serverType,
Map<String,String> configOverrides, String... args) throws IOException {
List<String> jvmOpts = new ArrayList<>();
@@ -568,7 +582,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
int ret = 0;
for (int i = 0; i < 5; i++) {
- ret = exec(Main.class, SetGoalState.class.getName(), MasterGoalState.NORMAL.toString())
+ ret = exec(Main.class, SetGoalState.class.getName(), ManagerGoalState.NORMAL.toString())
.getProcess().waitFor();
if (ret == 0) {
break;
@@ -756,13 +770,13 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
*
* @since 1.6.1
*/
- public MasterMonitorInfo getMasterMonitorInfo()
+ public ManagerMonitorInfo getMasterMonitorInfo()
throws AccumuloException, AccumuloSecurityException {
- MasterClientService.Iface client = null;
+ ManagerClientService.Iface client = null;
while (true) {
try (AccumuloClient c = Accumulo.newClient().from(getClientProperties()).build()) {
- client = MasterClient.getConnectionWithRetry((ClientContext) c);
- return client.getMasterStats(TraceUtil.traceInfo(), ((ClientContext) c).rpcCreds());
+ client = ManagerClient.getConnectionWithRetry((ClientContext) c);
+ return client.getManagerStats(TraceUtil.traceInfo(), ((ClientContext) c).rpcCreds());
} catch (ThriftSecurityException exception) {
throw new AccumuloSecurityException(exception);
} catch (ThriftNotActiveServiceException e) {
@@ -773,7 +787,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
throw new AccumuloException(exception);
} finally {
if (client != null) {
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
}
diff --git a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java
index 6f0aecf..3e0cec0 100644
--- a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.accumulo.cluster.standalone;
-import org.apache.accumulo.core.master.thrift.MasterGoalState;
+import org.apache.accumulo.core.master.thrift.ManagerGoalState;
import org.apache.accumulo.minicluster.ServerType;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -36,7 +36,7 @@ public class StandaloneAccumuloClusterTest {
// `SetGoalState NORMAL` should be called specifically on this method, not via
// ClusterControl.exec(..)
- control.setGoalState(MasterGoalState.NORMAL.toString());
+ control.setGoalState(ManagerGoalState.NORMAL.toString());
EasyMock.expectLastCall().once();
// Start the procs
diff --git a/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImplTest.java b/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImplTest.java
index 7f966cc..9243908 100644
--- a/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImplTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImplTest.java
@@ -32,9 +32,9 @@ import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.admin.TableOperations;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.master.thrift.MasterGoalState;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
-import org.apache.accumulo.core.master.thrift.MasterState;
+import org.apache.accumulo.core.master.thrift.ManagerGoalState;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerState;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.security.Authorizations;
@@ -103,7 +103,7 @@ public class MiniAccumuloClusterImplTest {
@Test(timeout = 60000)
public void saneMonitorInfo() throws Exception {
- MasterMonitorInfo stats;
+ ManagerMonitorInfo stats;
while (true) {
stats = accumulo.getMasterMonitorInfo();
if (stats.tableMap.size() <= 2) {
@@ -114,8 +114,8 @@ public class MiniAccumuloClusterImplTest {
break;
}
}
- List<MasterState> validStates = Arrays.asList(MasterState.values());
- List<MasterGoalState> validGoals = Arrays.asList(MasterGoalState.values());
+ List<ManagerState> validStates = Arrays.asList(ManagerState.values());
+ List<ManagerGoalState> validGoals = Arrays.asList(ManagerGoalState.values());
assertTrue("master state should be valid.", validStates.contains(stats.state));
assertTrue("master goal state should be in " + validGoals + ". is " + stats.goalState,
validGoals.contains(stats.goalState));
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index f077466..bc725d8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -59,7 +59,7 @@ import org.apache.accumulo.core.iterators.Combiner;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.iterators.user.VersioningIterator;
import org.apache.accumulo.core.manager.state.tables.TableState;
-import org.apache.accumulo.core.master.thrift.MasterGoalState;
+import org.apache.accumulo.core.master.thrift.ManagerGoalState;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.metadata.schema.DataFileValue;
@@ -636,7 +636,7 @@ public class Initialize implements KeywordExecutable {
zoo.putPersistentData(zkInstanceRoot + Constants.ZMASTER_LOCK, EMPTY_BYTE_ARRAY,
NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZMASTER_GOAL_STATE,
- MasterGoalState.NORMAL.toString().getBytes(UTF_8), NodeExistsPolicy.FAIL);
+ ManagerGoalState.NORMAL.toString().getBytes(UTF_8), NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZGC, EMPTY_BYTE_ARRAY, NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZGC_LOCK, EMPTY_BYTE_ARRAY,
NodeExistsPolicy.FAIL);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/manager/state/CurrentState.java b/server/base/src/main/java/org/apache/accumulo/server/manager/state/CurrentState.java
index d558e59..ea5c8a7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/manager/state/CurrentState.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/manager/state/CurrentState.java
@@ -23,7 +23,7 @@ import java.util.Set;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.dataImpl.KeyExtent;
-import org.apache.accumulo.core.master.thrift.MasterState;
+import org.apache.accumulo.core.master.thrift.ManagerState;
import org.apache.accumulo.core.metadata.TServerInstance;
public interface CurrentState {
@@ -42,5 +42,5 @@ public interface CurrentState {
*/
Set<KeyExtent> migrationsSnapshot();
- MasterState getMasterState();
+ ManagerState getMasterState();
}
diff --git a/server/base/src/main/java/org/apache/accumulo/server/manager/state/TabletStateChangeIterator.java b/server/base/src/main/java/org/apache/accumulo/server/manager/state/TabletStateChangeIterator.java
index 534a822..a56bed1 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/manager/state/TabletStateChangeIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/manager/state/TabletStateChangeIterator.java
@@ -38,7 +38,7 @@ import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.SkippingIterator;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.core.master.thrift.MasterState;
+import org.apache.accumulo.core.master.thrift.ManagerState;
import org.apache.accumulo.core.metadata.TServerInstance;
import org.apache.accumulo.core.metadata.TabletLocationState;
import org.apache.accumulo.core.metadata.TabletLocationState.BadLocationStateException;
@@ -57,7 +57,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
private static final String MERGES_OPTION = "merges";
private static final String DEBUG_OPTION = "debug";
private static final String MIGRATIONS_OPTION = "migrations";
- private static final String MASTER_STATE_OPTION = "masterState";
+ private static final String MASTER_STATE_OPTION = "managerState";
private static final String SHUTTING_DOWN_OPTION = "shuttingDown";
private static final Logger log = LoggerFactory.getLogger(TabletStateChangeIterator.class);
@@ -66,7 +66,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
private Map<TableId,MergeInfo> merges;
private boolean debug = false;
private Set<KeyExtent> migrations;
- private MasterState masterState = MasterState.NORMAL;
+ private ManagerState managerState = ManagerState.NORMAL;
@Override
public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options,
@@ -78,10 +78,10 @@ public class TabletStateChangeIterator extends SkippingIterator {
debug = options.containsKey(DEBUG_OPTION);
migrations = parseMigrations(options.get(MIGRATIONS_OPTION));
try {
- masterState = MasterState.valueOf(options.get(MASTER_STATE_OPTION));
+ managerState = ManagerState.valueOf(options.get(MASTER_STATE_OPTION));
} catch (Exception ex) {
if (options.get(MASTER_STATE_OPTION) != null) {
- log.error("Unable to decode masterState {}", options.get(MASTER_STATE_OPTION));
+ log.error("Unable to decode managerState {}", options.get(MASTER_STATE_OPTION));
}
}
Set<TServerInstance> shuttingDown = parseServers(options.get(SHUTTING_DOWN_OPTION));
@@ -159,7 +159,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
Key k = getSource().getTopKey();
Value v = getSource().getTopValue();
- if (onlineTables == null || current == null || masterState != MasterState.NORMAL)
+ if (onlineTables == null || current == null || managerState != ManagerState.NORMAL)
return;
TabletLocationState tls;
@@ -263,7 +263,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
cfg.addOption(MIGRATIONS_OPTION, encoded);
}
- public static void setMasterState(IteratorSetting cfg, MasterState state) {
+ public static void setMasterState(IteratorSetting cfg, ManagerState state) {
cfg.addOption(MASTER_STATE_OPTION, state.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 926d0f9..bd92612 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
@@ -33,7 +33,7 @@ import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
@@ -64,7 +64,7 @@ public class ReplicationUtil {
this.factory = factory;
}
- public int getMaxReplicationThreads(MasterMonitorInfo mmi) {
+ public int getMaxReplicationThreads(ManagerMonitorInfo mmi) {
int activeTservers = mmi.getTServerInfoSize();
// The number of threads each tserver will use at most to replicate data
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 f5b04ee..54ae75a 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
@@ -44,7 +44,7 @@ import org.apache.accumulo.core.client.NamespaceNotFoundException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.admin.InstanceOperations;
import org.apache.accumulo.core.clientImpl.ClientContext;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
@@ -107,7 +107,11 @@ public class Admin implements KeywordExecutable {
String tableName = null;
}
- @Parameters(commandDescription = "stop the master")
+ @Parameters(commandDescription = "stop the manager")
+ static class StopManagerCommand {}
+
+ @Deprecated(since = "2.1.0")
+ @Parameters(commandDescription = "stop the master (DEPRECATED -- use stopManager instead)")
static class StopMasterCommand {}
@Parameters(commandDescription = "stop all the servers")
@@ -204,6 +208,8 @@ public class Admin implements KeywordExecutable {
cl.addCommand("stop", stopOpts);
StopAllCommand stopAllOpts = new StopAllCommand();
cl.addCommand("stopAll", stopAllOpts);
+ StopManagerCommand stopManagerOpts = new StopManagerCommand();
+ cl.addCommand("stopManager", stopManagerOpts);
StopMasterCommand stopMasterOpts = new StopMasterCommand();
cl.addCommand("stopMaster", stopMasterOpts);
@@ -362,7 +368,7 @@ public class Admin implements KeywordExecutable {
private static void stopServer(final ClientContext context, final boolean tabletServersToo)
throws AccumuloException, AccumuloSecurityException {
- MasterClient.executeVoid(context,
+ ManagerClient.executeVoid(context,
client -> client.shutdown(TraceUtil.traceInfo(), context.rpcCreds(), tabletServersToo));
}
@@ -380,7 +386,7 @@ public class Admin implements KeywordExecutable {
final String finalServer =
qualifyWithZooKeeperSessionId(zTServerRoot, zc, address.toString());
log.info("Stopping server {}", finalServer);
- MasterClient.executeVoid(context, client -> client
+ ManagerClient.executeVoid(context, client -> client
.shutdownTabletServer(TraceUtil.traceInfo(), context.rpcCreds(), finalServer, force));
}
}
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/ManagerMetadataUtil.java
similarity index 98%
rename from server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
rename to server/base/src/main/java/org/apache/accumulo/server/util/ManagerMetadataUtil.java
index c664af1..ab07c06 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ManagerMetadataUtil.java
@@ -59,9 +59,9 @@ import org.apache.zookeeper.KeeperException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class MasterMetadataUtil {
+public class ManagerMetadataUtil {
- private static final Logger log = LoggerFactory.getLogger(MasterMetadataUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(ManagerMetadataUtil.class);
public static void addNewTablet(ServerContext context, KeyExtent extent, String dirName,
TServerInstance location, Map<StoredTabletFile,DataFileValue> datafileSizes,
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
index 12bf951..509fb34 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.accumulo.core.master.thrift.Compacting;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
@@ -69,7 +69,7 @@ public class TableInfoUtil {
return summary;
}
- public static Map<String,Double> summarizeTableStats(MasterMonitorInfo mmi) {
+ public static Map<String,Double> summarizeTableStats(ManagerMonitorInfo mmi) {
Map<String,Double> compactingByTable = new HashMap<>();
if (mmi != null && mmi.tServerInfo != null) {
for (TabletServerStatus status : mmi.tServerInfo) {
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java
index 3aff54c..c85b160 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java
@@ -45,6 +45,7 @@ public class AdminCommandsTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void testStopMasterCommand() {
new Admin.StopMasterCommand();
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
index c11aab4..4e63870 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
@@ -91,10 +91,10 @@ import org.slf4j.Logger;
class FateServiceHandler implements FateService.Iface {
- protected final Master master;
- protected static final Logger log = Master.log;
+ protected final Manager master;
+ protected static final Logger log = Manager.log;
- public FateServiceHandler(Master master) {
+ public FateServiceHandler(Manager master) {
this.master = master;
}
@@ -401,7 +401,7 @@ class FateServiceHandler implements FateService.Iface {
if (!canMerge)
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
- Master.log.debug("Creating merge op: {} {} {}", tableId, startRow, endRow);
+ Manager.log.debug("Creating merge op: {} {} {}", tableId, startRow, endRow);
master.fate.seedTransaction(opid, new TraceRepo<>(
new TableRangeOp(MergeInfo.Operation.MERGE, namespaceId, tableId, startRow, endRow)),
autoCleanup);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/Master.java b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
similarity index 94%
rename from server/manager/src/main/java/org/apache/accumulo/manager/Master.java
rename to server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index bbfde41..08bfe2b 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Master.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@ -67,11 +67,11 @@ import org.apache.accumulo.core.manager.balancer.TServerStatusImpl;
import org.apache.accumulo.core.manager.balancer.TabletServerIdImpl;
import org.apache.accumulo.core.manager.state.tables.TableState;
import org.apache.accumulo.core.master.thrift.BulkImportState;
-import org.apache.accumulo.core.master.thrift.MasterClientService.Iface;
-import org.apache.accumulo.core.master.thrift.MasterClientService.Processor;
-import org.apache.accumulo.core.master.thrift.MasterGoalState;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
-import org.apache.accumulo.core.master.thrift.MasterState;
+import org.apache.accumulo.core.master.thrift.ManagerClientService.Iface;
+import org.apache.accumulo.core.master.thrift.ManagerClientService.Processor;
+import org.apache.accumulo.core.master.thrift.ManagerGoalState;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerState;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.metadata.MetadataTable;
@@ -103,9 +103,9 @@ import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.fate.zookeeper.ZooUtil;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
-import org.apache.accumulo.manager.metrics.MasterMetricsFactory;
+import org.apache.accumulo.manager.metrics.ManagerMetricsFactory;
import org.apache.accumulo.manager.recovery.RecoveryManager;
-import org.apache.accumulo.manager.replication.MasterReplicationCoordinator;
+import org.apache.accumulo.manager.replication.ManagerReplicationCoordinator;
import org.apache.accumulo.manager.replication.ReplicationDriver;
import org.apache.accumulo.manager.replication.WorkDriver;
import org.apache.accumulo.manager.state.TableCounts;
@@ -162,10 +162,10 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
* <p>
* The master will also coordinate log recoveries and reports general status.
*/
-public class Master extends AbstractServer
+public class Manager extends AbstractServer
implements LiveTServerSet.Listener, TableObserver, CurrentState, HighlyAvailableService {
- static final Logger log = LoggerFactory.getLogger(Master.class);
+ static final Logger log = LoggerFactory.getLogger(Manager.class);
static final int ONE_SECOND = 1000;
static final long TIME_TO_WAIT_BETWEEN_SCANS = 60 * ONE_SECOND;
@@ -194,7 +194,7 @@ public class Master extends AbstractServer
private Thread replicationWorkThread;
private Thread replicationAssignerThread;
RecoveryManager recoveryManager = null;
- private final MasterTime timeKeeper;
+ private final ManagerTime timeKeeper;
// Delegation Token classes
private final boolean delegationTokensAvailable;
@@ -206,9 +206,9 @@ public class Master extends AbstractServer
private volatile TabletBalancer tabletBalancer;
private final BalancerEnvironment balancerEnvironment;
- private MasterState state = MasterState.INITIAL;
+ private ManagerState state = ManagerState.INITIAL;
- Fate<Master> fate;
+ Fate<Manager> fate;
volatile SortedMap<TServerInstance,TabletServerStatus> tserverStatus =
Collections.unmodifiableSortedMap(new TreeMap<>());
@@ -219,12 +219,12 @@ public class Master extends AbstractServer
private final AtomicBoolean masterInitialized = new AtomicBoolean(false);
@Override
- public synchronized MasterState getMasterState() {
+ public synchronized ManagerState getMasterState() {
return state;
}
public boolean stillMaster() {
- return getMasterState() != MasterState.STOP;
+ return getMasterState() != ManagerState.STOP;
}
static final boolean X = true;
@@ -240,32 +240,32 @@ public class Master extends AbstractServer
/* UNLOAD_ROOT_TABLET */ {O, O, O, X, X, X, X},
/* STOP */ {O, O, O, O, O, X, X}};
//@formatter:on
- synchronized void setMasterState(MasterState newState) {
+ synchronized void setMasterState(ManagerState newState) {
if (state.equals(newState)) {
return;
}
if (!transitionOK[state.ordinal()][newState.ordinal()]) {
log.error("Programmer error: master should not transition from {} to {}", state, newState);
}
- MasterState oldState = state;
+ ManagerState oldState = state;
state = newState;
nextEvent.event("State changed from %s to %s", oldState, newState);
- if (newState == MasterState.STOP) {
+ if (newState == ManagerState.STOP) {
// Give the server a little time before shutdown so the client
// thread requesting the stop can return
ThreadPools.createGeneralScheduledExecutorService(getConfiguration())
.scheduleWithFixedDelay(() -> {
// This frees the main thread and will cause the master to exit
clientService.stop();
- Master.this.nextEvent.event("stopped event loop");
+ Manager.this.nextEvent.event("stopped event loop");
}, 100L, 1000L, TimeUnit.MILLISECONDS);
}
- if (oldState != newState && (newState == MasterState.HAVE_LOCK)) {
+ if (oldState != newState && (newState == ManagerState.HAVE_LOCK)) {
upgradeCoordinator.upgradeZookeeper(getContext(), nextEvent);
}
- if (oldState != newState && (newState == MasterState.NORMAL)) {
+ if (oldState != newState && (newState == ManagerState.NORMAL)) {
if (fate != null) {
throw new IllegalStateException("Access to Fate should not have been"
+ " initialized prior to the Master finishing upgrades. Please save"
@@ -279,7 +279,7 @@ public class Master extends AbstractServer
private Future<Void> upgradeMetadataFuture;
- private MasterClientServiceHandler clientHandler;
+ private ManagerClientServiceHandler clientHandler;
private int assignedOrHosted(TableId tableId) {
int result = 0;
@@ -367,13 +367,7 @@ public class Master extends AbstractServer
return getContext().getTableManager();
}
- public static void main(String[] args) throws Exception {
- try (Master master = new Master(new ServerOpts(), args)) {
- master.runServer();
- }
- }
-
- Master(ServerOpts opts, String[] args) throws IOException {
+ Manager(ServerOpts opts, String[] args) throws IOException {
super("master", opts, args);
ServerContext context = super.getContext();
balancerEnvironment = new BalancerEnvironmentImpl(context);
@@ -382,7 +376,7 @@ public class Master extends AbstractServer
log.info("Version {}", Constants.VERSION);
log.info("Instance {}", getInstanceID());
- timeKeeper = new MasterTime(this, aconf);
+ timeKeeper = new ManagerTime(this, aconf);
ThriftTransportPool.getInstance()
.setIdleTime(aconf.getTimeInMillis(Property.GENERAL_RPC_TIMEOUT));
tserverSet = new LiveTServerSet(context, this);
@@ -483,7 +477,7 @@ public class Master extends AbstractServer
nextEvent.event("Merge state of %s cleared", tableId);
}
- void setMasterGoalState(MasterGoalState state) {
+ void setMasterGoalState(ManagerGoalState state) {
try {
getContext().getZooReaderWriter().putPersistentData(
getZooKeeperRoot() + Constants.ZMASTER_GOAL_STATE, state.name().getBytes(),
@@ -493,12 +487,12 @@ public class Master extends AbstractServer
}
}
- MasterGoalState getMasterGoalState() {
+ ManagerGoalState getMasterGoalState() {
while (true) {
try {
byte[] data = getContext().getZooReaderWriter()
.getData(getZooKeeperRoot() + Constants.ZMASTER_GOAL_STATE);
- return MasterGoalState.valueOf(new String(data));
+ return ManagerGoalState.valueOf(new String(data));
} catch (Exception e) {
log.error("Problem getting real goal state from zookeeper: ", e);
sleepUninterruptibly(1, TimeUnit.SECONDS);
@@ -728,27 +722,27 @@ public class Master extends AbstractServer
try {
switch (getMasterGoalState()) {
case NORMAL:
- setMasterState(MasterState.NORMAL);
+ setMasterState(ManagerState.NORMAL);
break;
case SAFE_MODE:
- if (getMasterState() == MasterState.NORMAL) {
- setMasterState(MasterState.SAFE_MODE);
+ if (getMasterState() == ManagerState.NORMAL) {
+ setMasterState(ManagerState.SAFE_MODE);
}
- if (getMasterState() == MasterState.HAVE_LOCK) {
- setMasterState(MasterState.SAFE_MODE);
+ if (getMasterState() == ManagerState.HAVE_LOCK) {
+ setMasterState(ManagerState.SAFE_MODE);
}
break;
case CLEAN_STOP:
switch (getMasterState()) {
case NORMAL:
- setMasterState(MasterState.SAFE_MODE);
+ setMasterState(ManagerState.SAFE_MODE);
break;
case SAFE_MODE: {
int count = nonMetaDataTabletsAssignedOrHosted();
log.debug(
String.format("There are %d non-metadata tablets assigned or hosted", count));
if (count == 0 && goodStats()) {
- setMasterState(MasterState.UNLOAD_METADATA_TABLETS);
+ setMasterState(ManagerState.UNLOAD_METADATA_TABLETS);
}
}
break;
@@ -757,7 +751,7 @@ public class Master extends AbstractServer
log.debug(
String.format("There are %d metadata tablets assigned or hosted", count));
if (count == 0 && goodStats()) {
- setMasterState(MasterState.UNLOAD_ROOT_TABLET);
+ setMasterState(ManagerState.UNLOAD_ROOT_TABLET);
}
}
break;
@@ -765,7 +759,7 @@ public class Master extends AbstractServer
int count = assignedOrHosted(MetadataTable.ID);
if (count > 0 && goodStats()) {
log.debug(String.format("%d metadata tablets online", count));
- setMasterState(MasterState.UNLOAD_ROOT_TABLET);
+ setMasterState(ManagerState.UNLOAD_ROOT_TABLET);
}
int root_count = assignedOrHosted(RootTable.ID);
if (root_count > 0 && goodStats()) {
@@ -785,7 +779,7 @@ public class Master extends AbstractServer
}
}
if (currentServers.isEmpty()) {
- setMasterState(MasterState.STOP);
+ setMasterState(ManagerState.STOP);
}
}
break;
@@ -821,7 +815,7 @@ public class Master extends AbstractServer
badServers.keySet());
} else if (notHosted() > 0) {
log.debug("not balancing because there are unhosted tablets: {}", notHosted());
- } else if (getMasterGoalState() == MasterGoalState.CLEAN_STOP) {
+ } else if (getMasterGoalState() == ManagerGoalState.CLEAN_STOP) {
log.debug("not balancing because the master is attempting to stop cleanly");
} else if (!serversToShutdown.isEmpty()) {
log.debug("not balancing while shutting down servers {}", serversToShutdown);
@@ -1016,7 +1010,7 @@ public class Master extends AbstractServer
// when a hot-standby
//
// Start the Master's Client service
- clientHandler = new MasterClientServiceHandler(this);
+ clientHandler = new ManagerClientServiceHandler(this);
// Ensure that calls before the master gets the lock fail
Iface haProxy = HighlyAvailableServiceWrapper.service(clientHandler, this);
Iface rpcProxy = TraceUtil.wrapService(haProxy);
@@ -1127,7 +1121,7 @@ public class Master extends AbstractServer
}
try {
- final AgeOffStore<Master> store = new AgeOffStore<>(new org.apache.accumulo.fate.ZooStore<>(
+ final AgeOffStore<Manager> store = new AgeOffStore<>(new org.apache.accumulo.fate.ZooStore<>(
getZooKeeperRoot() + Constants.ZFATE, context.getZooReaderWriter()), 1000 * 60 * 60 * 8);
fate = new Fate<>(this, store, TraceRepo::toLogString);
@@ -1200,7 +1194,7 @@ public class Master extends AbstractServer
}, 0, 5000, TimeUnit.MILLISECONDS);
// Register metrics modules
- int failureCount = new MasterMetricsFactory(getConfiguration()).register(this);
+ int failureCount = new ManagerMetricsFactory(getConfiguration()).register(this);
if (failureCount > 0) {
log.info("Failed to register {} metrics modules", failureCount);
@@ -1346,7 +1340,7 @@ public class Master extends AbstractServer
throws UnknownHostException, KeeperException, InterruptedException {
ServerContext context = getContext();
// Start the replication coordinator which assigns tservers to service replication requests
- MasterReplicationCoordinator impl = new MasterReplicationCoordinator(this);
+ ManagerReplicationCoordinator impl = new ManagerReplicationCoordinator(this);
ReplicationCoordinator.Iface haReplicationProxy =
HighlyAvailableServiceWrapper.service(impl, this);
ReplicationCoordinator.Processor<ReplicationCoordinator.Iface> replicationCoordinatorProcessor =
@@ -1382,7 +1376,7 @@ public class Master extends AbstractServer
return masterLock;
}
- private static class MasterLockWatcher implements ZooLock.AccumuloLockWatcher {
+ private static class ManagerLockWatcher implements ZooLock.AccumuloLockWatcher {
boolean acquiredLock = false;
boolean failedToAcquireLock = false;
@@ -1449,17 +1443,17 @@ public class Master extends AbstractServer
UUID zooLockUUID = UUID.randomUUID();
while (true) {
- MasterLockWatcher masterLockWatcher = new MasterLockWatcher();
+ ManagerLockWatcher managerLockWatcher = new ManagerLockWatcher();
masterLock = new ZooLock(context.getSiteConfiguration(), zMasterLoc, zooLockUUID);
- masterLock.lock(masterLockWatcher, masterClientAddress.getBytes());
+ masterLock.lock(managerLockWatcher, masterClientAddress.getBytes());
- masterLockWatcher.waitForChange();
+ managerLockWatcher.waitForChange();
- if (masterLockWatcher.acquiredLock) {
+ if (managerLockWatcher.acquiredLock) {
break;
}
- if (!masterLockWatcher.failedToAcquireLock) {
+ if (!managerLockWatcher.failedToAcquireLock) {
throw new IllegalStateException("master lock in unknown state");
}
@@ -1468,7 +1462,7 @@ public class Master extends AbstractServer
sleepUninterruptibly(TIME_TO_WAIT_BETWEEN_LOCK_CHECKS, TimeUnit.MILLISECONDS);
}
- setMasterState(MasterState.HAVE_LOCK);
+ setMasterState(ManagerState.HAVE_LOCK);
}
@Override
@@ -1488,7 +1482,7 @@ public class Master extends AbstractServer
if (serversToShutdown.contains(dead)) {
cause = "clean shutdown"; // maybe an incorrect assumption
}
- if (!getMasterGoalState().equals(MasterGoalState.CLEAN_STOP)) {
+ if (!getMasterGoalState().equals(ManagerGoalState.CLEAN_STOP)) {
obit.post(dead.getHostPort(), cause);
}
}
@@ -1496,7 +1490,7 @@ public class Master extends AbstractServer
Set<TServerInstance> unexpected = new HashSet<>(deleted);
unexpected.removeAll(this.serversToShutdown);
if (!unexpected.isEmpty()) {
- if (stillMaster() && !getMasterGoalState().equals(MasterGoalState.CLEAN_STOP)) {
+ if (stillMaster() && !getMasterGoalState().equals(ManagerGoalState.CLEAN_STOP)) {
log.warn("Lost servers {}", unexpected);
}
}
@@ -1566,11 +1560,11 @@ public class Master extends AbstractServer
@Override
public Set<TableId> onlineTables() {
Set<TableId> result = new HashSet<>();
- if (getMasterState() != MasterState.NORMAL) {
- if (getMasterState() != MasterState.UNLOAD_METADATA_TABLETS) {
+ if (getMasterState() != ManagerState.NORMAL) {
+ if (getMasterState() != ManagerState.UNLOAD_METADATA_TABLETS) {
result.add(MetadataTable.ID);
}
- if (getMasterState() != MasterState.UNLOAD_ROOT_TABLET) {
+ if (getMasterState() != ManagerState.UNLOAD_ROOT_TABLET) {
result.add(RootTable.ID);
}
return result;
@@ -1619,14 +1613,14 @@ public class Master extends AbstractServer
public void assignedTablet(KeyExtent extent) {
if (extent.isMeta()) {
- if (getMasterState().equals(MasterState.UNLOAD_ROOT_TABLET)) {
- setMasterState(MasterState.UNLOAD_METADATA_TABLETS);
+ if (getMasterState().equals(ManagerState.UNLOAD_ROOT_TABLET)) {
+ setMasterState(ManagerState.UNLOAD_METADATA_TABLETS);
}
}
if (extent.isRootTablet()) {
// probably too late, but try anyhow
- if (getMasterState().equals(MasterState.STOP)) {
- setMasterState(MasterState.UNLOAD_ROOT_TABLET);
+ if (getMasterState().equals(ManagerState.STOP)) {
+ setMasterState(ManagerState.UNLOAD_ROOT_TABLET);
}
}
}
@@ -1647,8 +1641,8 @@ public class Master extends AbstractServer
}
}
- public MasterMonitorInfo getMasterMonitorInfo() {
- final MasterMonitorInfo result = new MasterMonitorInfo();
+ public ManagerMonitorInfo getMasterMonitorInfo() {
+ final ManagerMonitorInfo result = new ManagerMonitorInfo();
result.tServerInfo = new ArrayList<>();
result.tableMap = new HashMap<>();
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/MasterClientServiceHandler.java b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
similarity index 93%
rename from server/manager/src/main/java/org/apache/accumulo/manager/MasterClientServiceHandler.java
rename to server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
index 15f993d..694ac03 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/MasterClientServiceHandler.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
@@ -57,10 +57,10 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
-import org.apache.accumulo.core.master.thrift.MasterGoalState;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
-import org.apache.accumulo.core.master.thrift.MasterState;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
+import org.apache.accumulo.core.master.thrift.ManagerGoalState;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerState;
import org.apache.accumulo.core.master.thrift.TabletLoadState;
import org.apache.accumulo.core.master.thrift.TabletSplit;
import org.apache.accumulo.core.metadata.MetadataTable;
@@ -100,14 +100,14 @@ import org.slf4j.LoggerFactory;
import com.google.protobuf.InvalidProtocolBufferException;
-public class MasterClientServiceHandler extends FateServiceHandler
- implements MasterClientService.Iface {
+public class ManagerClientServiceHandler extends FateServiceHandler
+ implements ManagerClientService.Iface {
- private static final Logger log = Master.log;
+ private static final Logger log = Manager.log;
private static final Logger drainLog =
LoggerFactory.getLogger("org.apache.accumulo.master.MasterDrainImpl");
- protected MasterClientServiceHandler(Master master) {
+ protected ManagerClientServiceHandler(Manager master) {
super(master);
}
@@ -133,7 +133,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
throw new ThriftTableOperationException(tableId.canonical(), null, TableOperation.FLUSH,
TableOperationExceptionType.NOTFOUND, null);
} catch (Exception e) {
- Master.log.warn("{}", e.getMessage(), e);
+ Manager.log.warn("{}", e.getMessage(), e);
throw new ThriftTableOperationException(tableId.canonical(), null, TableOperation.FLUSH,
TableOperationExceptionType.OTHER, null);
}
@@ -167,7 +167,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
server.flush(master.masterLock, tableId, ByteBufferUtil.toBytes(startRowBB),
ByteBufferUtil.toBytes(endRowBB));
} catch (TException ex) {
- Master.log.error(ex.toString());
+ Manager.log.error(ex.toString());
}
}
@@ -210,7 +210,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
TableOperationExceptionType.NOTFOUND, null);
} catch (TabletDeletedException e) {
- Master.log.debug("Failed to scan {} table to wait for flush {}", MetadataTable.NAME,
+ Manager.log.debug("Failed to scan {} table to wait for flush {}", MetadataTable.NAME,
tableId, e);
}
}
@@ -230,7 +230,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
}
@Override
- public MasterMonitorInfo getMasterStats(TInfo info, TCredentials credentials) {
+ public ManagerMonitorInfo getManagerStats(TInfo info, TCredentials credentials) {
return master.getMasterMonitorInfo();
}
@@ -252,13 +252,13 @@ public class MasterClientServiceHandler extends FateServiceHandler
if (!master.security.canPerformSystemActions(c))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
if (stopTabletServers) {
- master.setMasterGoalState(MasterGoalState.CLEAN_STOP);
+ master.setMasterGoalState(ManagerGoalState.CLEAN_STOP);
EventCoordinator.Listener eventListener = master.nextEvent.getListener();
do {
- eventListener.waitForEvents(Master.ONE_SECOND);
+ eventListener.waitForEvents(Manager.ONE_SECOND);
} while (master.tserverSet.size() > 0);
}
- master.setMasterState(MasterState.STOP);
+ master.setMasterState(ManagerState.STOP);
}
@Override
@@ -271,7 +271,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
if (!force) {
final TServerConnection server = master.tserverSet.getConnection(doomed);
if (server == null) {
- Master.log.warn("No server found for name {}", tabletServer);
+ Manager.log.warn("No server found for name {}", tabletServer);
return;
}
}
@@ -292,7 +292,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
TabletSplit split) {
KeyExtent oldTablet = KeyExtent.fromThrift(split.oldTablet);
if (master.migrations.remove(oldTablet) != null) {
- Master.log.info("Canceled migration of {}", split.oldTablet);
+ Manager.log.info("Canceled migration of {}", split.oldTablet);
}
for (TServerInstance instance : master.tserverSet.getCurrentServers()) {
if (serverName.equals(instance.getHostPort())) {
@@ -302,7 +302,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
return;
}
}
- Master.log.warn("Got a split from a server we don't recognize: {}", serverName);
+ Manager.log.warn("Got a split from a server we don't recognize: {}", serverName);
}
@Override
@@ -312,7 +312,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
switch (status) {
case LOAD_FAILURE:
- Master.log.error("{} reports assignment failed for tablet {}", serverName, tablet);
+ Manager.log.error("{} reports assignment failed for tablet {}", serverName, tablet);
break;
case LOADED:
master.nextEvent.event("tablet %s was loaded on %s", tablet, serverName);
@@ -321,11 +321,11 @@ public class MasterClientServiceHandler extends FateServiceHandler
master.nextEvent.event("tablet %s was unloaded from %s", tablet, serverName);
break;
case UNLOAD_ERROR:
- Master.log.error("{} reports unload failed for tablet {}", serverName, tablet);
+ Manager.log.error("{} reports unload failed for tablet {}", serverName, tablet);
break;
case UNLOAD_FAILURE_NOT_SERVING:
- if (Master.log.isTraceEnabled()) {
- Master.log.trace("{} reports unload failed: not serving tablet, could be a split: {}",
+ if (Manager.log.isTraceEnabled()) {
+ Manager.log.trace("{} reports unload failed: not serving tablet, could be a split: {}",
serverName, tablet);
}
break;
@@ -336,7 +336,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
}
@Override
- public void setMasterGoalState(TInfo info, TCredentials c, MasterGoalState state)
+ public void setManagerGoalState(TInfo info, TCredentials c, ManagerGoalState state)
throws ThriftSecurityException {
if (!master.security.canPerformSystemActions(c))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
@@ -354,7 +354,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
SystemPropUtil.removeSystemProperty(master.getContext(), property);
updatePlugins(property);
} catch (Exception e) {
- Master.log.error("Problem removing config property in zookeeper", e);
+ Manager.log.error("Problem removing config property in zookeeper", e);
throw new RuntimeException(e.getMessage());
}
}
@@ -372,7 +372,7 @@ public class MasterClientServiceHandler extends FateServiceHandler
// throw the exception here so it is not caught and converted to a generic TException
throw iae;
} catch (Exception e) {
- Master.log.error("Problem setting config property in zookeeper", e);
+ Manager.log.error("Problem setting config property in zookeeper", e);
throw new TException(e.getMessage());
}
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerExecutable.java b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerExecutable.java
index 2fcbb4a..7eff9ba 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerExecutable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerExecutable.java
@@ -18,6 +18,7 @@
*/
package org.apache.accumulo.manager;
+import org.apache.accumulo.server.ServerOpts;
import org.apache.accumulo.start.spi.KeywordExecutable;
import com.google.auto.service.AutoService;
@@ -42,7 +43,9 @@ public class ManagerExecutable implements KeywordExecutable {
@Override
public void execute(final String[] args) throws Exception {
- Master.main(args);
+ try (Manager master = new Manager(new ServerOpts(), args)) {
+ master.runServer();
+ }
}
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/MasterTime.java b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerTime.java
similarity index 94%
rename from server/manager/src/main/java/org/apache/accumulo/manager/MasterTime.java
rename to server/manager/src/main/java/org/apache/accumulo/manager/ManagerTime.java
index 7d80b95..a99f110 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/MasterTime.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerTime.java
@@ -38,12 +38,12 @@ import org.slf4j.LoggerFactory;
/**
* Keep a persistent roughly monotone view of how long a master has been overseeing this cluster.
*/
-public class MasterTime {
- private static final Logger log = LoggerFactory.getLogger(MasterTime.class);
+public class ManagerTime {
+ private static final Logger log = LoggerFactory.getLogger(ManagerTime.class);
private final String zPath;
private final ZooReaderWriter zk;
- private final Master master;
+ private final Manager master;
/**
* Difference between time stored in ZooKeeper and System.nanoTime() when we last read from
@@ -51,7 +51,7 @@ public class MasterTime {
*/
private final AtomicLong skewAmount;
- public MasterTime(Master master, AccumuloConfiguration conf) throws IOException {
+ public ManagerTime(Manager master, AccumuloConfiguration conf) throws IOException {
this.zPath = master.getZooKeeperRoot() + Constants.ZMASTER_TICK;
this.zk = master.getContext().getZooReaderWriter();
this.master = master;
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/MasterExecutable.java b/server/manager/src/main/java/org/apache/accumulo/manager/MasterExecutable.java
index 58dc37e..eb5cda3 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/MasterExecutable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/MasterExecutable.java
@@ -22,6 +22,7 @@ import org.apache.accumulo.start.spi.KeywordExecutable;
import com.google.auto.service.AutoService;
+@Deprecated(since = "2.1.0")
@AutoService(KeywordExecutable.class)
public class MasterExecutable implements KeywordExecutable {
@@ -42,7 +43,7 @@ public class MasterExecutable implements KeywordExecutable {
@Override
public void execute(final String[] args) throws Exception {
- Master.main(args);
+ new ManagerExecutable().execute(args);
}
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java b/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java
index d236303..cc968b7 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java
@@ -54,7 +54,7 @@ import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.logging.TabletLogger;
import org.apache.accumulo.core.manager.state.tables.TableState;
-import org.apache.accumulo.core.master.thrift.MasterState;
+import org.apache.accumulo.core.master.thrift.ManagerState;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
@@ -74,7 +74,7 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Ta
import org.apache.accumulo.core.metadata.schema.MetadataTime;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
-import org.apache.accumulo.manager.Master.TabletGoalState;
+import org.apache.accumulo.manager.Manager.TabletGoalState;
import org.apache.accumulo.manager.state.MergeStats;
import org.apache.accumulo.manager.state.TableCounts;
import org.apache.accumulo.manager.state.TableStats;
@@ -102,13 +102,13 @@ import com.google.common.collect.Iterators;
abstract class TabletGroupWatcher extends Thread {
// Constants used to make sure assignment logging isn't excessive in quantity or size
- private final Master master;
+ private final Manager master;
private final TabletStateStore store;
private final TabletGroupWatcher dependentWatcher;
final TableStats stats = new TableStats();
private SortedSet<TServerInstance> lastScanServers = ImmutableSortedSet.of();
- TabletGroupWatcher(Master master, TabletStateStore store, TabletGroupWatcher dependentWatcher) {
+ TabletGroupWatcher(Manager master, TabletStateStore store, TabletGroupWatcher dependentWatcher) {
this.master = master;
this.store = store;
this.dependentWatcher = dependentWatcher;
@@ -149,7 +149,7 @@ abstract class TabletGroupWatcher extends Thread {
private final SortedMap<TServerInstance,TabletServerStatus> currentTServers;
private final SortedMap<TServerInstance,TabletServerStatus> destinations;
- public TabletLists(Master m, SortedMap<TServerInstance,TabletServerStatus> curTServers) {
+ public TabletLists(Manager m, SortedMap<TServerInstance,TabletServerStatus> curTServers) {
var destinationsMod = new TreeMap<>(curTServers);
// Don't move tablets to servers that are shutting down
destinationsMod.keySet().removeAll(m.serversToShutdown);
@@ -196,7 +196,7 @@ abstract class TabletGroupWatcher extends Thread {
}
if (currentTServers.isEmpty()) {
- eventListener.waitForEvents(Master.TIME_TO_WAIT_BETWEEN_SCANS);
+ eventListener.waitForEvents(Manager.TIME_TO_WAIT_BETWEEN_SCANS);
synchronized (this) {
lastScanServers = ImmutableSortedSet.of();
}
@@ -205,7 +205,7 @@ abstract class TabletGroupWatcher extends Thread {
TabletLists tLists = new TabletLists(master, currentTServers);
- MasterState masterState = master.getMasterState();
+ ManagerState managerState = master.getMasterState();
int[] counts = new int[TabletState.values().length];
stats.begin();
// Walk through the tablets in our store, and work tablets
@@ -223,11 +223,11 @@ abstract class TabletGroupWatcher extends Thread {
// Don't overwhelm the tablet servers with work
if (tLists.unassigned.size() + unloaded
- > Master.MAX_TSERVER_WORK_CHUNK * currentTServers.size()) {
+ > Manager.MAX_TSERVER_WORK_CHUNK * currentTServers.size()) {
flushChanges(tLists, wals);
tLists.reset();
unloaded = 0;
- eventListener.waitForEvents(Master.TIME_TO_WAIT_BETWEEN_SCANS);
+ eventListener.waitForEvents(Manager.TIME_TO_WAIT_BETWEEN_SCANS);
}
TableId tableId = tls.extent.tableId();
TableConfiguration tableConf = master.getContext().getTableConfiguration(tableId);
@@ -307,7 +307,7 @@ abstract class TabletGroupWatcher extends Thread {
unloaded++;
totalUnloaded++;
} else {
- Master.log.warn("Could not connect to server {}", location);
+ Manager.log.warn("Could not connect to server {}", location);
}
break;
case ASSIGNED:
@@ -320,7 +320,7 @@ abstract class TabletGroupWatcher extends Thread {
flushChanges(tLists, wals);
// provide stats after flushing changes to avoid race conditions w/ delete table
- stats.end(masterState);
+ stats.end(managerState);
// Report changes
for (TabletState state : TabletState.values()) {
@@ -330,7 +330,7 @@ abstract class TabletGroupWatcher extends Thread {
state.name());
}
}
- Master.log.debug(String.format("[%s]: scan time %.2f seconds", store.name(),
+ Manager.log.debug(String.format("[%s]: scan time %.2f seconds", store.name(),
stats.getScanTime() / 1000.));
oldCounts = counts;
if (totalUnloaded > 0) {
@@ -343,25 +343,25 @@ abstract class TabletGroupWatcher extends Thread {
lastScanServers = ImmutableSortedSet.copyOf(currentTServers.keySet());
}
if (master.tserverSet.getCurrentServers().equals(currentTServers.keySet())) {
- Master.log.debug(String.format("[%s] sleeping for %.2f seconds", store.name(),
- Master.TIME_TO_WAIT_BETWEEN_SCANS / 1000.));
- eventListener.waitForEvents(Master.TIME_TO_WAIT_BETWEEN_SCANS);
+ Manager.log.debug(String.format("[%s] sleeping for %.2f seconds", store.name(),
+ Manager.TIME_TO_WAIT_BETWEEN_SCANS / 1000.));
+ eventListener.waitForEvents(Manager.TIME_TO_WAIT_BETWEEN_SCANS);
} else {
- Master.log.info("Detected change in current tserver set, re-running state machine.");
+ Manager.log.info("Detected change in current tserver set, re-running state machine.");
}
} catch (Exception ex) {
- Master.log.error("Error processing table state for store " + store.name(), ex);
+ Manager.log.error("Error processing table state for store " + store.name(), ex);
if (ex.getCause() != null && ex.getCause() instanceof BadLocationStateException) {
repairMetadata(((BadLocationStateException) ex.getCause()).getEncodedEndRow());
} else {
- sleepUninterruptibly(Master.WAIT_BETWEEN_ERRORS, TimeUnit.MILLISECONDS);
+ sleepUninterruptibly(Manager.WAIT_BETWEEN_ERRORS, TimeUnit.MILLISECONDS);
}
} finally {
if (iter != null) {
try {
iter.close();
} catch (IOException ex) {
- Master.log.warn("Error closing TabletLocationState iterator: " + ex, ex);
+ Manager.log.warn("Error closing TabletLocationState iterator: " + ex, ex);
}
}
}
@@ -442,7 +442,7 @@ abstract class TabletGroupWatcher extends Thread {
}
private void repairMetadata(Text row) {
- Master.log.debug("Attempting repair on {}", row);
+ Manager.log.debug("Attempting repair on {}", row);
// ACCUMULO-2261 if a dying tserver writes a location before its lock information propagates, it
// may cause duplicate assignment.
// Attempt to find the dead server entry and remove it.
@@ -465,13 +465,13 @@ abstract class TabletGroupWatcher extends Thread {
}
}
if (!future.isEmpty() && !assigned.isEmpty()) {
- Master.log.warn("Found a tablet assigned and hosted, attempting to repair");
+ Manager.log.warn("Found a tablet assigned and hosted, attempting to repair");
} else if (future.size() > 1 && assigned.isEmpty()) {
- Master.log.warn("Found a tablet assigned to multiple servers, attempting to repair");
+ Manager.log.warn("Found a tablet assigned to multiple servers, attempting to repair");
} else if (future.isEmpty() && assigned.size() > 1) {
- Master.log.warn("Found a tablet hosted on multiple servers, attempting to repair");
+ Manager.log.warn("Found a tablet hosted on multiple servers, attempting to repair");
} else {
- Master.log.info("Attempted a repair, but nothing seems to be obviously wrong. {} {}",
+ Manager.log.info("Attempted a repair, but nothing seems to be obviously wrong. {} {}",
assigned, future);
return;
}
@@ -481,7 +481,7 @@ abstract class TabletGroupWatcher extends Thread {
Entry<Key,Value> entry = iter.next();
TServerInstance alive = master.tserverSet.find(entry.getValue().toString());
if (alive == null) {
- Master.log.info("Removing entry {}", entry);
+ Manager.log.info("Removing entry {}", entry);
BatchWriter bw = master.getContext().createBatchWriter(table, new BatchWriterConfig());
Mutation m = new Mutation(entry.getKey().getRow());
m.putDelete(entry.getKey().getColumnFamily(), entry.getKey().getColumnQualifier());
@@ -490,11 +490,11 @@ abstract class TabletGroupWatcher extends Thread {
return;
}
}
- Master.log.error(
+ Manager.log.error(
"Metadata table is inconsistent at {} and all assigned/future tservers are still online.",
row);
} catch (Exception e) {
- Master.log.error("Error attempting repair of metadata " + row + ": " + e, e);
+ Manager.log.error("Error attempting repair of metadata " + row + ": " + e, e);
}
}
@@ -532,15 +532,15 @@ abstract class TabletGroupWatcher extends Thread {
TServerConnection conn;
conn = master.tserverSet.getConnection(tls.current);
if (conn != null) {
- Master.log.info("Asking {} to split {} at {}", tls.current, tls.extent, splitPoint);
+ Manager.log.info("Asking {} to split {} at {}", tls.current, tls.extent, splitPoint);
conn.splitTablet(tls.extent, splitPoint);
} else {
- Master.log.warn("Not connected to server {}", tls.current);
+ Manager.log.warn("Not connected to server {}", tls.current);
}
} catch (NotServingTabletException e) {
- Master.log.debug("Error asking tablet server to split a tablet: ", e);
+ Manager.log.debug("Error asking tablet server to split a tablet: ", e);
} catch (Exception e) {
- Master.log.warn("Error asking tablet server to split a tablet: ", e);
+ Manager.log.warn("Error asking tablet server to split a tablet: ", e);
}
}
}
@@ -562,13 +562,13 @@ abstract class TabletGroupWatcher extends Thread {
try {
conn = master.tserverSet.getConnection(tls.current);
if (conn != null) {
- Master.log.info("Asking {} to chop {}", tls.current, tls.extent);
+ Manager.log.info("Asking {} to chop {}", tls.current, tls.extent);
conn.chop(master.masterLock, tls.extent);
} else {
- Master.log.warn("Could not connect to server {}", tls.current);
+ Manager.log.warn("Could not connect to server {}", tls.current);
}
} catch (TException e) {
- Master.log.warn("Communications error asking tablet server to chop a tablet");
+ Manager.log.warn("Communications error asking tablet server to chop a tablet");
}
}
}
@@ -597,11 +597,11 @@ abstract class TabletGroupWatcher extends Thread {
update = MergeState.COMPLETE;
master.setMergeState(stats.getMergeInfo(), update);
} catch (Exception ex) {
- Master.log.error("Unable merge metadata table records", ex);
+ Manager.log.error("Unable merge metadata table records", ex);
}
}
} catch (Exception ex) {
- Master.log.error(
+ Manager.log.error(
"Unable to update merge state for merge " + stats.getMergeInfo().getExtent(), ex);
}
}
@@ -610,14 +610,14 @@ abstract class TabletGroupWatcher extends Thread {
private void deleteTablets(MergeInfo info) throws AccumuloException {
KeyExtent extent = info.getExtent();
String targetSystemTable = extent.isMeta() ? RootTable.NAME : MetadataTable.NAME;
- Master.log.debug("Deleting tablets for {}", extent);
+ Manager.log.debug("Deleting tablets for {}", extent);
MetadataTime metadataTime = null;
KeyExtent followingTablet = null;
if (extent.endRow() != null) {
Key nextExtent = new Key(extent.endRow()).followingKey(PartialKey.ROW);
followingTablet =
getHighTablet(new KeyExtent(extent.tableId(), nextExtent.getRow(), extent.endRow()));
- Master.log.debug("Found following tablet {}", followingTablet);
+ Manager.log.debug("Found following tablet {}", followingTablet);
}
try {
AccumuloClient client = master.getContext();
@@ -627,7 +627,7 @@ abstract class TabletGroupWatcher extends Thread {
if (start == null) {
start = new Text();
}
- Master.log.debug("Making file deletion entries for {}", extent);
+ Manager.log.debug("Making file deletion entries for {}", extent);
Range deleteRange = new Range(TabletsSection.encodeRow(extent.tableId(), start), false,
TabletsSection.encodeRow(extent.tableId(), extent.endRow()), true);
Scanner scanner = client.createScanner(targetSystemTable, Authorizations.EMPTY);
@@ -669,7 +669,7 @@ abstract class TabletGroupWatcher extends Thread {
}
if (followingTablet != null) {
- Master.log.debug("Updating prevRow of {} to {}", followingTablet, extent.prevEndRow());
+ Manager.log.debug("Updating prevRow of {} to {}", followingTablet, extent.prevEndRow());
bw = client.createBatchWriter(targetSystemTable, new BatchWriterConfig());
try {
Mutation m = new Mutation(followingTablet.toMetaRow());
@@ -694,9 +694,9 @@ abstract class TabletGroupWatcher extends Thread {
private void mergeMetadataRecords(MergeInfo info) throws AccumuloException {
KeyExtent range = info.getExtent();
- Master.log.debug("Merging metadata for {}", range);
+ Manager.log.debug("Merging metadata for {}", range);
KeyExtent stop = getHighTablet(range);
- Master.log.debug("Highest tablet is {}", stop);
+ Manager.log.debug("Highest tablet is {}", stop);
Value firstPrevRowValue = null;
Text stopRow = stop.toMetaRow();
Text start = range.prevEndRow();
@@ -731,7 +731,7 @@ abstract class TabletGroupWatcher extends Thread {
fileCount++;
} else if (TabletColumnFamily.PREV_ROW_COLUMN.hasColumns(key)
&& firstPrevRowValue == null) {
- Master.log.debug("prevRow entry for lowest tablet is {}", value);
+ Manager.log.debug("prevRow entry for lowest tablet is {}", value);
firstPrevRowValue = new Value(value);
} else if (ServerColumnFamily.TIME_COLUMN.hasColumns(key)) {
maxLogicalTime =
@@ -764,17 +764,17 @@ abstract class TabletGroupWatcher extends Thread {
bw.flush();
- Master.log.debug("Moved {} files to {}", fileCount, stop);
+ Manager.log.debug("Moved {} files to {}", fileCount, stop);
if (firstPrevRowValue == null) {
- Master.log.debug("tablet already merged");
+ Manager.log.debug("tablet already merged");
return;
}
stop = new KeyExtent(stop.tableId(), stop.endRow(),
TabletColumnFamily.decodePrevEndRow(firstPrevRowValue));
Mutation updatePrevRow = TabletColumnFamily.createPrevRowMutation(stop);
- Master.log.debug("Setting the prevRow for last tablet: {}", stop);
+ Manager.log.debug("Setting the prevRow for last tablet: {}", stop);
bw.addMutation(updatePrevRow);
bw.flush();
@@ -801,7 +801,7 @@ abstract class TabletGroupWatcher extends Thread {
// where the process terminates in the loop below...
scanner = client.createScanner(info.getExtent().isMeta() ? RootTable.NAME : MetadataTable.NAME,
Authorizations.EMPTY);
- Master.log.debug("Deleting range {}", scanRange);
+ Manager.log.debug("Deleting range {}", scanRange);
scanner.setRange(scanRange);
RowIterator rowIter = new RowIterator(scanner);
while (rowIter.hasNext()) {
@@ -815,7 +815,7 @@ abstract class TabletGroupWatcher extends Thread {
m = new Mutation(key.getRow());
m.putDelete(key.getColumnFamily(), key.getColumnQualifier());
- Master.log.debug("deleting entry {}", key);
+ Manager.log.debug("deleting entry {}", key);
}
bw.addMutation(m);
}
@@ -854,9 +854,9 @@ abstract class TabletGroupWatcher extends Thread {
if (!deadTablets.isEmpty()) {
int maxServersToShow = min(deadTablets.size(), 100);
- Master.log.debug("{} assigned to dead servers: {}...", deadTablets.size(),
+ Manager.log.debug("{} assigned to dead servers: {}...", deadTablets.size(),
deadTablets.subList(0, maxServersToShow));
- Master.log.debug("logs for dead servers: {}", deadLogs);
+ Manager.log.debug("logs for dead servers: {}", deadLogs);
if (canSuspendTablets()) {
store.suspend(deadTablets, deadLogs, master.getSteadyTime());
} else {
@@ -869,7 +869,7 @@ abstract class TabletGroupWatcher extends Thread {
}
if (!tLists.suspendedToGoneServers.isEmpty()) {
int maxServersToShow = min(deadTablets.size(), 100);
- Master.log.debug(deadTablets.size() + " suspended to gone servers: "
+ Manager.log.debug(deadTablets.size() + " suspended to gone servers: "
+ deadTablets.subList(0, maxServersToShow) + "...");
store.unsuspend(tLists.suspendedToGoneServers);
}
@@ -884,7 +884,7 @@ abstract class TabletGroupWatcher extends Thread {
if (unassigned.containsKey(assignment.getKey())) {
if (assignment.getValue() != null) {
if (!tLists.currentTServers.containsKey(assignment.getValue())) {
- Master.log.warn(
+ Manager.log.warn(
"balancer assigned {} to a tablet server that is not current {} ignoring",
assignment.getKey(), assignment.getValue());
continue;
@@ -893,14 +893,14 @@ abstract class TabletGroupWatcher extends Thread {
tLists.assignments.add(new Assignment(assignment.getKey(), assignment.getValue()));
}
} else {
- Master.log.warn(
+ Manager.log.warn(
"{} load balancer assigning tablet that was not nominated for assignment {}",
store.name(), assignment.getKey());
}
}
if (!unassigned.isEmpty() && assignedOut.isEmpty())
- Master.log.warn("Load balancer failed to assign any tablets");
+ Manager.log.warn("Load balancer failed to assign any tablets");
}
}
@@ -913,7 +913,7 @@ abstract class TabletGroupWatcher extends Thread {
getAssignmentsFromBalancer(tLists, unassigned);
if (!tLists.assignments.isEmpty()) {
- Master.log.info(String.format("Assigning %d tablets", tLists.assignments.size()));
+ Manager.log.info(String.format("Assigning %d tablets", tLists.assignments.size()));
store.setFutureLocations(tLists.assignments);
}
tLists.assignments.addAll(tLists.assigned);
@@ -922,7 +922,7 @@ abstract class TabletGroupWatcher extends Thread {
if (client != null) {
client.assignTablet(master.masterLock, a.tablet);
} else {
- Master.log.warn("Could not connect to server {}", a.server);
+ Manager.log.warn("Could not connect to server {}", a.server);
}
master.assignedTablet(a.tablet);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/MasterMetrics.java b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetrics.java
similarity index 87%
copy from server/manager/src/main/java/org/apache/accumulo/manager/metrics/MasterMetrics.java
copy to server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetrics.java
index 2719f7f..d8749d4 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/MasterMetrics.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetrics.java
@@ -20,9 +20,9 @@ package org.apache.accumulo.manager.metrics;
import org.apache.accumulo.server.metrics.Metrics;
-public abstract class MasterMetrics extends Metrics {
+public abstract class ManagerMetrics extends Metrics {
- protected MasterMetrics(String subName, String description, String record) {
+ protected ManagerMetrics(String subName, String description, String record) {
super("Master,sub=" + subName, description, "master", record);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/MasterMetricsFactory.java b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetricsFactory.java
similarity index 89%
rename from server/manager/src/main/java/org/apache/accumulo/manager/metrics/MasterMetricsFactory.java
rename to server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetricsFactory.java
index c527246..d66e672 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/MasterMetricsFactory.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetricsFactory.java
@@ -22,7 +22,7 @@ import static java.util.Objects.requireNonNull;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.manager.metrics.fate.FateMetrics;
import org.apache.hadoop.metrics2.MetricsSystem;
import org.slf4j.Logger;
@@ -33,20 +33,20 @@ import org.slf4j.LoggerFactory;
* be configured using hadoop metrics2 Fate metrics must be enabled via configuration file (default
* is disabled)
*/
-public class MasterMetricsFactory {
+public class ManagerMetricsFactory {
- private final static Logger log = LoggerFactory.getLogger(MasterMetricsFactory.class);
+ private final static Logger log = LoggerFactory.getLogger(ManagerMetricsFactory.class);
private final boolean enableFateMetrics;
private final long fateMinUpdateInterval;
- public MasterMetricsFactory(AccumuloConfiguration conf) {
+ public ManagerMetricsFactory(AccumuloConfiguration conf) {
requireNonNull(conf, "AccumuloConfiguration must not be null");
enableFateMetrics = conf.getBoolean(Property.MANAGER_FATE_METRICS_ENABLED);
fateMinUpdateInterval = conf.getTimeInMillis(Property.MANAGER_FATE_METRICS_MIN_UPDATE_INTERVAL);
}
- public int register(Master master) {
+ public int register(Manager master) {
MetricsSystem metricsSystem = master.getMetricsSystem();
int failureCount = 0;
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ReplicationMetrics.java b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ReplicationMetrics.java
index d59b765..db5c673 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ReplicationMetrics.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ReplicationMetrics.java
@@ -28,7 +28,7 @@ import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.manager.state.tables.TableState;
import org.apache.accumulo.core.replication.ReplicationTable;
import org.apache.accumulo.core.replication.ReplicationTarget;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.server.replication.ReplicationUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
@@ -37,17 +37,17 @@ import org.apache.hadoop.metrics2.lib.MutableStat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ReplicationMetrics extends MasterMetrics {
+public class ReplicationMetrics extends ManagerMetrics {
private static final Logger log = LoggerFactory.getLogger(ReplicationMetrics.class);
- private final Master master;
+ private final Manager master;
private final ReplicationUtil replicationUtil;
private final MutableQuantiles replicationQueueTimeQuantiles;
private final MutableStat replicationQueueTimeStat;
private final Map<Path,Long> pathModTimes;
- ReplicationMetrics(Master master) {
+ ReplicationMetrics(Manager master) {
super("Replication", "Data-Center Replication Metrics", "MasterReplication");
this.master = master;
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetrics.java b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetrics.java
index 689e5b8..202641f 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetrics.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetrics.java
@@ -27,7 +27,7 @@ import java.util.concurrent.locks.ReentrantLock;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.fate.ReadOnlyTStore;
import org.apache.accumulo.fate.ZooStore;
-import org.apache.accumulo.manager.metrics.MasterMetrics;
+import org.apache.accumulo.manager.metrics.ManagerMetrics;
import org.apache.accumulo.server.ServerContext;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
@@ -35,7 +35,7 @@ import org.apache.zookeeper.KeeperException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class FateMetrics extends MasterMetrics {
+public class FateMetrics extends ManagerMetrics {
private static final Logger log = LoggerFactory.getLogger(FateMetrics.class);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
index 646242f..419808a 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
@@ -38,7 +38,7 @@ import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.fate.zookeeper.ZooCache;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.fs.VolumeManager.FileType;
import org.apache.accumulo.server.fs.VolumeUtil;
@@ -64,10 +64,10 @@ public class RecoveryManager {
private Set<String> sortsQueued = new HashSet<>();
private Cache<Path,Boolean> existenceCache;
private ScheduledExecutorService executor;
- private Master master;
+ private Manager master;
private ZooCache zooCache;
- public RecoveryManager(Master master, long timeToCacheExistsInMillis) {
+ public RecoveryManager(Manager master, long timeToCacheExistsInMillis) {
this.master = master;
existenceCache =
CacheBuilder.newBuilder().expireAfterWrite(timeToCacheExistsInMillis, TimeUnit.MILLISECONDS)
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/replication/MasterReplicationCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/replication/ManagerReplicationCoordinator.java
similarity index 91%
rename from server/manager/src/main/java/org/apache/accumulo/manager/replication/MasterReplicationCoordinator.java
rename to server/manager/src/main/java/org/apache/accumulo/manager/replication/ManagerReplicationCoordinator.java
index 8fbfc73..9c25f5e 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/replication/MasterReplicationCoordinator.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/replication/ManagerReplicationCoordinator.java
@@ -34,7 +34,7 @@ import org.apache.accumulo.core.replication.thrift.ReplicationCoordinatorErrorCo
import org.apache.accumulo.core.replication.thrift.ReplicationCoordinatorException;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.accumulo.fate.zookeeper.ZooReader;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.server.security.AuditedSecurityOperation;
import org.apache.accumulo.server.security.SecurityOperation;
import org.apache.thrift.TException;
@@ -45,20 +45,20 @@ import org.slf4j.LoggerFactory;
/**
* Choose a tserver to service a replication task
*/
-public class MasterReplicationCoordinator implements ReplicationCoordinator.Iface {
- private static final Logger log = LoggerFactory.getLogger(MasterReplicationCoordinator.class);
+public class ManagerReplicationCoordinator implements ReplicationCoordinator.Iface {
+ private static final Logger log = LoggerFactory.getLogger(ManagerReplicationCoordinator.class);
- private final Master master;
+ private final Manager master;
private final Random rand;
private final ZooReader reader;
private final SecurityOperation security;
- public MasterReplicationCoordinator(Master master) {
+ public ManagerReplicationCoordinator(Manager master) {
this(master, new ZooReader(master.getContext().getZooKeepers(),
master.getContext().getZooKeepersSessionTimeOut()));
}
- protected MasterReplicationCoordinator(Master master, ZooReader reader) {
+ protected ManagerReplicationCoordinator(Manager master, ZooReader reader) {
this.master = master;
this.rand = new SecureRandom();
this.rand.setSeed(358923462L);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/replication/ReplicationDriver.java b/server/manager/src/main/java/org/apache/accumulo/manager/replication/ReplicationDriver.java
index fe80b20..6bac255 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/replication/ReplicationDriver.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/replication/ReplicationDriver.java
@@ -23,7 +23,7 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.fate.util.UtilWaitThread;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.htrace.Trace;
import org.apache.htrace.TraceScope;
import org.apache.htrace.impl.ProbabilitySampler;
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
public class ReplicationDriver implements Runnable {
private static final Logger log = LoggerFactory.getLogger(ReplicationDriver.class);
- private final Master master;
+ private final Manager master;
private final AccumuloConfiguration conf;
private WorkMaker workMaker;
@@ -45,7 +45,7 @@ public class ReplicationDriver implements Runnable {
private RemoveCompleteReplicationRecords rcrr;
private AccumuloClient client;
- public ReplicationDriver(Master master) {
+ public ReplicationDriver(Manager master) {
this.master = master;
this.conf = master.getConfiguration();
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/replication/WorkDriver.java b/server/manager/src/main/java/org/apache/accumulo/manager/replication/WorkDriver.java
index fdc0334..ba0cbbb 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/replication/WorkDriver.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/replication/WorkDriver.java
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.server.replication.WorkAssigner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,14 +36,14 @@ import org.slf4j.LoggerFactory;
public class WorkDriver implements Runnable {
private static final Logger log = LoggerFactory.getLogger(WorkDriver.class);
- private Master master;
+ private Manager master;
private AccumuloClient client;
private AccumuloConfiguration conf;
private WorkAssigner assigner;
private String assignerImplName;
- public WorkDriver(Master master) {
+ public WorkDriver(Manager master) {
super();
this.master = master;
this.client = master.getContext();
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/state/SetGoalState.java b/server/manager/src/main/java/org/apache/accumulo/manager/state/SetGoalState.java
index 8a7b460..71cb852 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/state/SetGoalState.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/state/SetGoalState.java
@@ -22,7 +22,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.conf.SiteConfiguration;
-import org.apache.accumulo.core.master.thrift.MasterGoalState;
+import org.apache.accumulo.core.master.thrift.ManagerGoalState;
import org.apache.accumulo.core.singletons.SingletonManager;
import org.apache.accumulo.core.singletons.SingletonManager.Mode;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -36,7 +36,7 @@ public class SetGoalState {
* Utility program that will change the goal state for the master from the command line.
*/
public static void main(String[] args) throws Exception {
- if (args.length != 1 || MasterGoalState.valueOf(args[0]) == null) {
+ if (args.length != 1 || ManagerGoalState.valueOf(args[0]) == null) {
System.err.println(
"Usage: accumulo " + SetGoalState.class.getName() + " [NORMAL|SAFE_MODE|CLEAN_STOP]");
System.exit(-1);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/state/TableStats.java b/server/manager/src/main/java/org/apache/accumulo/manager/state/TableStats.java
index e514196..0e9628e 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/state/TableStats.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/state/TableStats.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.accumulo.core.data.TableId;
-import org.apache.accumulo.core.master.thrift.MasterState;
+import org.apache.accumulo.core.master.thrift.ManagerState;
import org.apache.accumulo.core.metadata.TabletState;
public class TableStats {
@@ -30,7 +30,7 @@ public class TableStats {
private Map<TableId,TableCounts> next;
private long startScan = 0;
private long endScan = 0;
- private MasterState state;
+ private ManagerState state;
public synchronized void begin() {
next = new HashMap<>();
@@ -46,7 +46,7 @@ public class TableStats {
counts.counts[state.ordinal()]++;
}
- public synchronized void end(MasterState state) {
+ public synchronized void end(ManagerState state) {
last = next;
next = null;
endScan = System.currentTimeMillis();
@@ -57,7 +57,7 @@ public class TableStats {
return last;
}
- public synchronized MasterState getLastMasterState() {
+ public synchronized ManagerState getLastMasterState() {
return state;
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ChangeTableState.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ChangeTableState.java
index b899221..8567f7c 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ChangeTableState.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ChangeTableState.java
@@ -23,10 +23,10 @@ import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.manager.state.tables.TableState;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.slf4j.LoggerFactory;
-public class ChangeTableState extends MasterRepo {
+public class ChangeTableState extends ManagerRepo {
private static final long serialVersionUID = 1L;
private TableId tableId;
@@ -43,7 +43,7 @@ public class ChangeTableState extends MasterRepo {
}
@Override
- public long isReady(long tid, Master env) throws Exception {
+ public long isReady(long tid, Manager env) throws Exception {
// reserve the table so that this op does not run concurrently with create, clone, or delete
// table
return Utils.reserveNamespace(env, namespaceId, tid, false, true, top)
@@ -51,7 +51,7 @@ public class ChangeTableState extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master env) {
+ public Repo<Manager> call(long tid, Manager env) {
TableState ts = TableState.ONLINE;
if (top == TableOperation.OFFLINE)
ts = TableState.OFFLINE;
@@ -65,7 +65,7 @@ public class ChangeTableState extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) {
+ public void undo(long tid, Manager env) {
Utils.unreserveNamespace(env, namespaceId, tid, false);
Utils.unreserveTable(env, tableId, tid, true);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/MasterRepo.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ManagerRepo.java
similarity index 77%
rename from server/manager/src/main/java/org/apache/accumulo/manager/tableOps/MasterRepo.java
rename to server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ManagerRepo.java
index 8102b57..441c0a1 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/MasterRepo.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ManagerRepo.java
@@ -19,19 +19,19 @@
package org.apache.accumulo.manager.tableOps;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
-public abstract class MasterRepo implements Repo<Master> {
+public abstract class ManagerRepo implements Repo<Manager> {
private static final long serialVersionUID = 1L;
@Override
- public long isReady(long tid, Master environment) throws Exception {
+ public long isReady(long tid, Manager environment) throws Exception {
return 0;
}
@Override
- public void undo(long tid, Master environment) throws Exception {}
+ public void undo(long tid, Manager environment) throws Exception {}
@Override
public String getDescription() {
@@ -44,6 +44,6 @@ public abstract class MasterRepo implements Repo<Master> {
}
@Override
- public abstract Repo<Master> call(long tid, Master environment) throws Exception;
+ public abstract Repo<Manager> call(long tid, Manager environment) throws Exception;
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java
index 7e4f475..346926b 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java
@@ -21,7 +21,7 @@ package org.apache.accumulo.manager.tableOps;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.htrace.TraceScope;
import com.google.gson.Gson;
@@ -78,12 +78,12 @@ public class TraceRepo<T> implements Repo<T> {
/**
* @return string version of Repo that is suitable for logging
*/
- public static String toLogString(Repo<Master> repo) {
+ public static String toLogString(Repo<Manager> repo) {
if (repo instanceof TraceRepo) {
// There are two reasons the repo is unwrapped. First I could not figure out how to get this
// to work with Gson. Gson kept serializing nothing for the generic pointer TraceRepo.repo.
// Second I thought this information was not useful for logging.
- repo = ((TraceRepo<Master>) repo).repo;
+ repo = ((TraceRepo<Manager>) repo).repo;
}
// Inorder for Gson to work with generic types, the following passes repo.getClass() to Gson.
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
index f276ba0..f9399cf 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
@@ -42,7 +42,7 @@ import org.apache.accumulo.fate.zookeeper.DistributedReadWriteLock;
import org.apache.accumulo.fate.zookeeper.ZooQueueLock;
import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.fate.zookeeper.ZooReservation;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.server.ServerContext;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -86,7 +86,7 @@ public class Utils {
static final Lock tableNameLock = new ReentrantLock();
static final Lock idLock = new ReentrantLock();
- public static long reserveTable(Master env, TableId tableId, long tid, boolean writeLock,
+ public static long reserveTable(Manager env, TableId tableId, long tid, boolean writeLock,
boolean tableMustExist, TableOperation op) throws Exception {
if (getLock(env.getContext(), tableId, tid, writeLock).tryLock()) {
if (tableMustExist) {
@@ -102,20 +102,20 @@ public class Utils {
return 100;
}
- public static void unreserveTable(Master env, TableId tableId, long tid, boolean writeLock) {
+ public static void unreserveTable(Manager env, TableId tableId, long tid, boolean writeLock) {
getLock(env.getContext(), tableId, tid, writeLock).unlock();
log.info("table {} ({}) unlocked for {}", tableId, Long.toHexString(tid),
(writeLock ? "write" : "read"));
}
- public static void unreserveNamespace(Master env, NamespaceId namespaceId, long id,
+ public static void unreserveNamespace(Manager env, NamespaceId namespaceId, long id,
boolean writeLock) {
getLock(env.getContext(), namespaceId, id, writeLock).unlock();
log.info("namespace {} ({}) unlocked for {}", namespaceId, Long.toHexString(id),
(writeLock ? "write" : "read"));
}
- public static long reserveNamespace(Master env, NamespaceId namespaceId, long id,
+ public static long reserveNamespace(Manager env, NamespaceId namespaceId, long id,
boolean writeLock, boolean mustExist, TableOperation op) throws Exception {
if (getLock(env.getContext(), namespaceId, id, writeLock).tryLock()) {
if (mustExist) {
@@ -132,7 +132,7 @@ public class Utils {
return 100;
}
- public static long reserveHdfsDirectory(Master env, String directory, long tid)
+ public static long reserveHdfsDirectory(Manager env, String directory, long tid)
throws KeeperException, InterruptedException {
String resvPath = env.getContext().getZooKeeperRoot() + Constants.ZHDFS_RESERVATIONS + "/"
+ Base64.getEncoder().encodeToString(directory.getBytes(UTF_8));
@@ -145,7 +145,7 @@ public class Utils {
return 50;
}
- public static void unreserveHdfsDirectory(Master env, String directory, long tid)
+ public static void unreserveHdfsDirectory(Manager env, String directory, long tid)
throws KeeperException, InterruptedException {
String resvPath = env.getContext().getZooKeeperRoot() + Constants.ZHDFS_RESERVATIONS + "/"
+ Base64.getEncoder().encodeToString(directory.getBytes(UTF_8));
@@ -177,7 +177,7 @@ public class Utils {
return tableNameLock;
}
- public static Lock getReadLock(Master env, AbstractId<?> id, long tid) {
+ public static Lock getReadLock(Manager env, AbstractId<?> id, long tid) {
return Utils.getLock(env.getContext(), id, tid, false);
}
@@ -200,7 +200,7 @@ public class Utils {
* @param path
* the fully-qualified path
*/
- public static SortedSet<Text> getSortedSetFromFile(Master master, Path path, boolean encoded)
+ public static SortedSet<Text> getSortedSetFromFile(Manager master, Path path, boolean encoded)
throws IOException {
FileSystem fs = path.getFileSystem(master.getContext().getHadoopConf());
var data = new TreeSet<Text>();
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/BulkImport.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/BulkImport.java
index df5d4ef..8729de2 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/BulkImport.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/BulkImport.java
@@ -42,8 +42,8 @@ import org.apache.accumulo.core.master.thrift.BulkImportState;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.fate.FateTxId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.ServerContext;
@@ -74,7 +74,7 @@ import com.google.common.annotations.VisibleForTesting;
* about the request. To prevent problems like this, an Arbitrator is used. Before starting any new
* request, the tablet server checks the Arbitrator to see if the request is still valid.
*/
-public class BulkImport extends MasterRepo {
+public class BulkImport extends ManagerRepo {
public static final String FAILURES_TXT = "failures.txt";
private static final long serialVersionUID = 1L;
@@ -94,7 +94,7 @@ public class BulkImport extends MasterRepo {
}
@Override
- public long isReady(long tid, Master master) throws Exception {
+ public long isReady(long tid, Manager master) throws Exception {
if (!Utils.getReadLock(master, tableId, tid).tryLock())
return 100;
@@ -112,7 +112,7 @@ public class BulkImport extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
String fmtTid = FateTxId.formatTid(tid);
log.debug(" {} sourceDir {}", fmtTid, sourceDir);
@@ -276,7 +276,7 @@ public class BulkImport extends MasterRepo {
}
@Override
- public void undo(long tid, Master environment) throws Exception {
+ public void undo(long tid, Manager environment) throws Exception {
// unreserve source/error directories
Utils.unreserveHdfsDirectory(environment, sourceDir, tid);
Utils.unreserveHdfsDirectory(environment, errorDir, tid);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/CleanUpBulkImport.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/CleanUpBulkImport.java
index f2f90e1..549f4fb 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/CleanUpBulkImport.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/CleanUpBulkImport.java
@@ -26,8 +26,8 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.master.thrift.BulkImportState;
import org.apache.accumulo.fate.FateTxId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
@@ -35,7 +35,7 @@ import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CleanUpBulkImport extends MasterRepo {
+public class CleanUpBulkImport extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -54,7 +54,7 @@ public class CleanUpBulkImport extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
master.updateBulkImportStatus(source, BulkImportState.CLEANUP);
log.debug("removing the bulkDir processing flag file in " + bulk);
Path bulkDir = new Path(bulk);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/CompleteBulkImport.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/CompleteBulkImport.java
index 613df64..ab9377b 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/CompleteBulkImport.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/CompleteBulkImport.java
@@ -21,11 +21,11 @@ package org.apache.accumulo.manager.tableOps.bulkVer1;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
-public class CompleteBulkImport extends MasterRepo {
+public class CompleteBulkImport extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -42,7 +42,7 @@ public class CompleteBulkImport extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
ZooArbitrator.stop(master.getContext(), Constants.BULK_ARBITRATOR_TYPE, tid);
return new CopyFailed(tableId, source, bulk, error);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/CopyFailed.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/CopyFailed.java
index da173a1..8f7fb61 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/CopyFailed.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/CopyFailed.java
@@ -42,8 +42,8 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Bu
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.fate.FateTxId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.manager.LiveTServerSet.TServerConnection;
import org.apache.accumulo.server.zookeeper.DistributedWorkQueue;
@@ -52,7 +52,7 @@ import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class CopyFailed extends MasterRepo {
+class CopyFailed extends ManagerRepo {
private static final Logger log = LoggerFactory.getLogger(CopyFailed.class);
private static final long serialVersionUID = 1L;
@@ -70,7 +70,7 @@ class CopyFailed extends MasterRepo {
}
@Override
- public long isReady(long tid, Master master) {
+ public long isReady(long tid, Manager master) {
Set<TServerInstance> finished = new HashSet<>();
Set<TServerInstance> running = master.onlineTabletServers();
for (TServerInstance server : running) {
@@ -89,7 +89,7 @@ class CopyFailed extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
// This needs to execute after the arbiter is stopped
master.updateBulkImportStatus(source, BulkImportState.COPY_FILES);
VolumeManager fs = master.getVolumeManager();
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/LoadFiles.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/LoadFiles.java
index 716cbca..ac252f8 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/LoadFiles.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/LoadFiles.java
@@ -51,8 +51,8 @@ import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.fate.FateTxId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileStatus;
@@ -60,7 +60,7 @@ import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class LoadFiles extends MasterRepo {
+class LoadFiles extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -82,13 +82,13 @@ class LoadFiles extends MasterRepo {
}
@Override
- public long isReady(long tid, Master master) {
+ public long isReady(long tid, Manager master) {
if (master.onlineTabletServers().isEmpty())
return 500;
return 0;
}
- private static synchronized ExecutorService getThreadPool(Master master) {
+ private static synchronized ExecutorService getThreadPool(Manager master) {
if (threadPool == null) {
threadPool = ThreadPools.createExecutorService(master.getConfiguration(),
Property.MANAGER_BULK_THREADPOOL_SIZE);
@@ -97,7 +97,7 @@ class LoadFiles extends MasterRepo {
}
@Override
- public Repo<Master> call(final long tid, final Master master) throws Exception {
+ public Repo<Manager> call(final long tid, final Manager master) throws Exception {
master.updateBulkImportStatus(source, BulkImportState.LOADING);
ExecutorService executor = getThreadPool(master);
final AccumuloConfiguration conf = master.getConfiguration();
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/BulkImportMove.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/BulkImportMove.java
index b4d0c47..0be174c 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/BulkImportMove.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/BulkImportMove.java
@@ -32,8 +32,8 @@ import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.manager.state.tables.TableState;
import org.apache.accumulo.fate.FateTxId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
* about the request. To prevent problems like this, an Arbitrator is used. Before starting any new
* request, the tablet server checks the Arbitrator to see if the request is still valid.
*/
-class BulkImportMove extends MasterRepo {
+class BulkImportMove extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -69,7 +69,7 @@ class BulkImportMove extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
final Path bulkDir = new Path(bulkInfo.bulkDir);
final Path sourceDir = new Path(bulkInfo.sourceDir);
@@ -99,7 +99,7 @@ class BulkImportMove extends MasterRepo {
/**
* For every entry in renames, move the file from the key path to the value path
*/
- private void moveFiles(long tid, Path sourceDir, Path bulkDir, Master master,
+ private void moveFiles(long tid, Path sourceDir, Path bulkDir, Manager master,
final VolumeManager fs, Map<String,String> renames) throws Exception {
MetadataTableUtil.addBulkLoadInProgressFlag(master.getContext(),
"/" + bulkDir.getParent().getName() + "/" + bulkDir.getName(), tid);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java
index b2c4d6c..7a3d4a9 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java
@@ -26,8 +26,8 @@ import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.manager.state.tables.TableState;
import org.apache.accumulo.fate.FateTxId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
@@ -35,7 +35,7 @@ import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CleanUpBulkImport extends MasterRepo {
+public class CleanUpBulkImport extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -48,7 +48,7 @@ public class CleanUpBulkImport extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
log.debug("removing the bulkDir processing flag file in " + info.bulkDir);
Path bulkDir = new Path(info.bulkDir);
MetadataTableUtil.removeBulkLoadInProgressFlag(master.getContext(),
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CompleteBulkImport.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CompleteBulkImport.java
index b344917..374d691 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CompleteBulkImport.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CompleteBulkImport.java
@@ -20,11 +20,11 @@ package org.apache.accumulo.manager.tableOps.bulkVer2;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
-public class CompleteBulkImport extends MasterRepo {
+public class CompleteBulkImport extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@ public class CompleteBulkImport extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
ZooArbitrator.stop(master.getContext(), Constants.BULK_ARBITRATOR_TYPE, tid);
return new CleanUpBulkImport(info);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
index 507c901..3c4eb8b 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
@@ -60,8 +60,8 @@ import org.apache.accumulo.core.util.PeekingIterator;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.accumulo.fate.FateTxId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
@@ -75,7 +75,7 @@ import com.google.common.base.Preconditions;
* Make asynchronous load calls to each overlapping Tablet. This RepO does its work on the isReady
* and will return a linear sleep value based on the largest number of Tablets on a TabletServer.
*/
-class LoadFiles extends MasterRepo {
+class LoadFiles extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -88,7 +88,7 @@ class LoadFiles extends MasterRepo {
}
@Override
- public long isReady(long tid, Master master) throws Exception {
+ public long isReady(long tid, Manager master) throws Exception {
if (master.onlineTabletServers().isEmpty()) {
log.warn("There are no tablet server to process bulkDir import, waiting (tid = "
+ FateTxId.formatTid(tid) + ")");
@@ -103,7 +103,7 @@ class LoadFiles extends MasterRepo {
}
@Override
- public Repo<Master> call(final long tid, final Master master) {
+ public Repo<Manager> call(final long tid, final Manager master) {
if (bulkInfo.tableState == TableState.ONLINE) {
return new CompleteBulkImport(bulkInfo);
} else {
@@ -113,11 +113,11 @@ class LoadFiles extends MasterRepo {
private abstract static class Loader {
protected Path bulkDir;
- protected Master master;
+ protected Manager master;
protected long tid;
protected boolean setTime;
- void start(Path bulkDir, Master master, long tid, boolean setTime) throws Exception {
+ void start(Path bulkDir, Manager master, long tid, boolean setTime) throws Exception {
this.bulkDir = bulkDir;
this.master = master;
this.tid = tid;
@@ -145,7 +145,7 @@ class LoadFiles extends MasterRepo {
private int queuedDataSize = 0;
@Override
- void start(Path bulkDir, Master master, long tid, boolean setTime) throws Exception {
+ void start(Path bulkDir, Manager master, long tid, boolean setTime) throws Exception {
super.start(bulkDir, master, tid, setTime);
timeInMillis = master.getConfiguration().getTimeInMillis(Property.MANAGER_BULK_TIMEOUT);
@@ -262,7 +262,7 @@ class LoadFiles extends MasterRepo {
MapCounter<HostAndPort> unloadingTablets;
@Override
- void start(Path bulkDir, Master master, long tid, boolean setTime) throws Exception {
+ void start(Path bulkDir, Manager master, long tid, boolean setTime) throws Exception {
Preconditions.checkArgument(!setTime);
super.start(bulkDir, master, tid, setTime);
bw = master.getContext().createBatchWriter(MetadataTable.NAME);
@@ -314,7 +314,7 @@ class LoadFiles extends MasterRepo {
* all files have been loaded.
*/
private long loadFiles(TableId tableId, Path bulkDir, LoadMappingIterator loadMapIter,
- Master master, long tid) throws Exception {
+ Manager master, long tid) throws Exception {
PeekingIterator<Map.Entry<KeyExtent,Bulk.Files>> lmi = new PeekingIterator<>(loadMapIter);
Map.Entry<KeyExtent,Bulk.Files> loadMapEntry = lmi.peek();
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/PrepBulkImport.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/PrepBulkImport.java
index 155ccb5..823e222 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/PrepBulkImport.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/PrepBulkImport.java
@@ -45,8 +45,8 @@ import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.ServerContext;
@@ -71,7 +71,7 @@ import com.google.common.annotations.VisibleForTesting;
*
* @since 2.0.0
*/
-public class PrepBulkImport extends MasterRepo {
+public class PrepBulkImport extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -88,7 +88,7 @@ public class PrepBulkImport extends MasterRepo {
}
@Override
- public long isReady(long tid, Master master) throws Exception {
+ public long isReady(long tid, Manager master) throws Exception {
if (!Utils.getReadLock(master, bulkInfo.tableId, tid).tryLock())
return 100;
@@ -180,7 +180,7 @@ public class PrepBulkImport extends MasterRepo {
}
}
- private void checkForMerge(final long tid, final Master master) throws Exception {
+ private void checkForMerge(final long tid, final Manager master) throws Exception {
VolumeManager fs = master.getVolumeManager();
final Path bulkDir = new Path(bulkInfo.sourceDir);
@@ -200,7 +200,7 @@ public class PrepBulkImport extends MasterRepo {
}
@Override
- public Repo<Master> call(final long tid, final Master master) throws Exception {
+ public Repo<Manager> call(final long tid, final Manager master) throws Exception {
// now that table lock is acquired check that all splits in load mapping exists in table
checkForMerge(tid, master);
@@ -256,7 +256,7 @@ public class PrepBulkImport extends MasterRepo {
}
@Override
- public void undo(long tid, Master environment) throws Exception {
+ public void undo(long tid, Manager environment) throws Exception {
// unreserve sourceDir/error directories
Utils.unreserveHdfsDirectory(environment, bulkInfo.sourceDir, tid);
Utils.getReadLock(environment, bulkInfo.tableId, tid).unlock();
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneMetadata.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneMetadata.java
index b92ab66..f32c493 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneMetadata.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneMetadata.java
@@ -19,12 +19,12 @@
package org.apache.accumulo.manager.tableOps.clone;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.slf4j.LoggerFactory;
-class CloneMetadata extends MasterRepo {
+class CloneMetadata extends ManagerRepo {
private static final long serialVersionUID = 1L;
private CloneInfo cloneInfo;
@@ -34,12 +34,12 @@ class CloneMetadata extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) {
+ public long isReady(long tid, Manager environment) {
return 0;
}
@Override
- public Repo<Master> call(long tid, Master environment) throws Exception {
+ public Repo<Manager> call(long tid, Manager environment) throws Exception {
LoggerFactory.getLogger(CloneMetadata.class)
.info(String.format("Cloning %s with tableId %s from srcTableId %s", cloneInfo.tableName,
cloneInfo.tableId, cloneInfo.srcTableId));
@@ -52,7 +52,7 @@ class CloneMetadata extends MasterRepo {
}
@Override
- public void undo(long tid, Master environment) throws Exception {
+ public void undo(long tid, Manager environment) throws Exception {
MetadataTableUtil.deleteTable(cloneInfo.tableId, false, environment.getContext(),
environment.getMasterLock());
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/ClonePermissions.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/ClonePermissions.java
index 2312813..5a6d5de 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/ClonePermissions.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/ClonePermissions.java
@@ -25,12 +25,12 @@ import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.security.AuditedSecurityOperation;
import org.slf4j.LoggerFactory;
-class ClonePermissions extends MasterRepo {
+class ClonePermissions extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -41,12 +41,12 @@ class ClonePermissions extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) {
+ public long isReady(long tid, Manager environment) {
return 0;
}
@Override
- public Repo<Master> call(long tid, Master environment) throws Exception {
+ public Repo<Manager> call(long tid, Manager environment) throws Exception {
// give all table permissions to the creator
for (TablePermission permission : TablePermission.values()) {
try {
@@ -72,7 +72,7 @@ class ClonePermissions extends MasterRepo {
}
@Override
- public void undo(long tid, Master environment) throws Exception {
+ public void undo(long tid, Manager environment) throws Exception {
AuditedSecurityOperation.getInstance(environment.getContext())
.deleteTable(environment.getContext().rpcCreds(), cloneInfo.tableId, cloneInfo.namespaceId);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneTable.java
index edb04bf..91788a6 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneTable.java
@@ -25,11 +25,11 @@ import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
-public class CloneTable extends MasterRepo {
+public class CloneTable extends ManagerRepo {
private static final long serialVersionUID = 1L;
private CloneInfo cloneInfo;
@@ -47,7 +47,7 @@ public class CloneTable extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) throws Exception {
+ public long isReady(long tid, Manager environment) throws Exception {
long val = Utils.reserveNamespace(environment, cloneInfo.srcNamespaceId, tid, false, true,
TableOperation.CLONE);
val += Utils.reserveTable(environment, cloneInfo.srcTableId, tid, false, true,
@@ -56,7 +56,7 @@ public class CloneTable extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master environment) throws Exception {
+ public Repo<Manager> call(long tid, Manager environment) throws Exception {
Utils.getIdLock().lock();
try {
@@ -70,7 +70,7 @@ public class CloneTable extends MasterRepo {
}
@Override
- public void undo(long tid, Master environment) {
+ public void undo(long tid, Manager environment) {
Utils.unreserveNamespace(environment, cloneInfo.srcNamespaceId, tid, false);
Utils.unreserveTable(environment, cloneInfo.srcTableId, tid, false);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneZookeeper.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneZookeeper.java
index fe614a2..1db721f 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneZookeeper.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/CloneZookeeper.java
@@ -24,11 +24,11 @@ import org.apache.accumulo.core.clientImpl.Namespaces;
import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
-class CloneZookeeper extends MasterRepo {
+class CloneZookeeper extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -42,7 +42,7 @@ class CloneZookeeper extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) throws Exception {
+ public long isReady(long tid, Manager environment) throws Exception {
long val = 0;
if (!cloneInfo.srcNamespaceId.equals(cloneInfo.namespaceId))
val += Utils.reserveNamespace(environment, cloneInfo.namespaceId, tid, false, true,
@@ -53,7 +53,7 @@ class CloneZookeeper extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master environment) throws Exception {
+ public Repo<Manager> call(long tid, Manager environment) throws Exception {
Utils.getTableNameLock().lock();
try {
// write tableName & tableId to zookeeper
@@ -73,7 +73,7 @@ class CloneZookeeper extends MasterRepo {
}
@Override
- public void undo(long tid, Master environment) throws Exception {
+ public void undo(long tid, Manager environment) throws Exception {
environment.getTableManager().removeTable(cloneInfo.tableId);
if (!cloneInfo.srcNamespaceId.equals(cloneInfo.namespaceId))
Utils.unreserveNamespace(environment, cloneInfo.namespaceId, tid, false);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/FinishCloneTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/FinishCloneTable.java
index 4bebeab..465a519 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/FinishCloneTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/clone/FinishCloneTable.java
@@ -20,12 +20,12 @@ package org.apache.accumulo.manager.tableOps.clone;
import org.apache.accumulo.core.manager.state.tables.TableState;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.slf4j.LoggerFactory;
-class FinishCloneTable extends MasterRepo {
+class FinishCloneTable extends ManagerRepo {
private static final long serialVersionUID = 1L;
private CloneInfo cloneInfo;
@@ -35,12 +35,12 @@ class FinishCloneTable extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) {
+ public long isReady(long tid, Manager environment) {
return 0;
}
@Override
- public Repo<Master> call(long tid, Master environment) {
+ public Repo<Manager> call(long tid, Manager environment) {
// directories are intentionally not created.... this is done because directories should be
// unique
// because they occupy a different namespace than normal tablet directories... also some clones
@@ -69,6 +69,6 @@ class FinishCloneTable extends MasterRepo {
}
@Override
- public void undo(long tid, Master environment) {}
+ public void undo(long tid, Manager environment) {}
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactRange.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactRange.java
index 7cf4cc3..dfa52c4 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactRange.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactRange.java
@@ -36,15 +36,15 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.commons.codec.binary.Hex;
import org.apache.zookeeper.KeeperException.NoNodeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CompactRange extends MasterRepo {
+public class CompactRange extends ManagerRepo {
private static final Logger log = LoggerFactory.getLogger(CompactRange.class);
private static final long serialVersionUID = 1L;
@@ -88,13 +88,13 @@ public class CompactRange extends MasterRepo {
}
@Override
- public long isReady(long tid, Master env) throws Exception {
+ public long isReady(long tid, Manager env) throws Exception {
return Utils.reserveNamespace(env, namespaceId, tid, false, true, TableOperation.COMPACT)
+ Utils.reserveTable(env, tableId, tid, false, true, TableOperation.COMPACT);
}
@Override
- public Repo<Master> call(final long tid, Master env) throws Exception {
+ public Repo<Manager> call(final long tid, Manager env) throws Exception {
String zTablePath = Constants.ZROOT + "/" + env.getInstanceID() + Constants.ZTABLES + "/"
+ tableId + Constants.ZTABLE_COMPACT_ID;
@@ -142,7 +142,7 @@ public class CompactRange extends MasterRepo {
}
- static void removeIterators(Master environment, final long txid, TableId tableId)
+ static void removeIterators(Manager environment, final long txid, TableId tableId)
throws Exception {
String zTablePath = Constants.ZROOT + "/" + environment.getInstanceID() + Constants.ZTABLES
+ "/" + tableId + Constants.ZTABLE_COMPACT_ID;
@@ -170,7 +170,7 @@ public class CompactRange extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) throws Exception {
+ public void undo(long tid, Manager env) throws Exception {
try {
removeIterators(env, tid, tableId);
} finally {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java
index 4e63ca2..1389f14 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java
@@ -37,14 +37,14 @@ import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
import org.apache.accumulo.core.util.MapCounter;
import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.manager.LiveTServerSet.TServerConnection;
import org.apache.thrift.TException;
import org.slf4j.LoggerFactory;
-class CompactionDriver extends MasterRepo {
+class CompactionDriver extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -64,7 +64,7 @@ class CompactionDriver extends MasterRepo {
}
@Override
- public long isReady(long tid, Master master) throws Exception {
+ public long isReady(long tid, Manager master) throws Exception {
if (tableId.equals(RootTable.ID)) {
// this codes not properly handle the root table. See #798
@@ -142,7 +142,7 @@ class CompactionDriver extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master env) throws Exception {
+ public Repo<Manager> call(long tid, Manager env) throws Exception {
CompactRange.removeIterators(env, tid, tableId);
Utils.getReadLock(env, tableId, tid).unlock();
Utils.getReadLock(env, namespaceId, tid).unlock();
@@ -150,7 +150,7 @@ class CompactionDriver extends MasterRepo {
}
@Override
- public void undo(long tid, Master environment) {
+ public void undo(long tid, Manager environment) {
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/CancelCompactions.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/CancelCompactions.java
index 428b4a7..4151aaa 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/CancelCompactions.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/CancelCompactions.java
@@ -27,13 +27,13 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.fate.FateTxId;
import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CancelCompactions extends MasterRepo {
+public class CancelCompactions extends ManagerRepo {
private static final long serialVersionUID = 1L;
private TableId tableId;
@@ -47,13 +47,13 @@ public class CancelCompactions extends MasterRepo {
}
@Override
- public long isReady(long tid, Master env) throws Exception {
+ public long isReady(long tid, Manager env) throws Exception {
return Utils.reserveNamespace(env, namespaceId, tid, false, true, TableOperation.COMPACT_CANCEL)
+ Utils.reserveTable(env, tableId, tid, false, true, TableOperation.COMPACT_CANCEL);
}
@Override
- public Repo<Master> call(long tid, Master environment) throws Exception {
+ public Repo<Manager> call(long tid, Manager environment) throws Exception {
String zCompactID = Constants.ZROOT + "/" + environment.getInstanceID() + Constants.ZTABLES
+ "/" + tableId + Constants.ZTABLE_COMPACT_ID;
String zCancelID = Constants.ZROOT + "/" + environment.getInstanceID() + Constants.ZTABLES + "/"
@@ -85,7 +85,7 @@ public class CancelCompactions extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) {
+ public void undo(long tid, Manager env) {
Utils.unreserveTable(env, tableId, tid, false);
Utils.unreserveNamespace(env, namespaceId, tid, false);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/FinishCancelCompaction.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/FinishCancelCompaction.java
index 83a2240..9080a3e 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/FinishCancelCompaction.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/cancel/FinishCancelCompaction.java
@@ -21,11 +21,11 @@ package org.apache.accumulo.manager.tableOps.compact.cancel;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
-class FinishCancelCompaction extends MasterRepo {
+class FinishCancelCompaction extends ManagerRepo {
private static final long serialVersionUID = 1L;
private TableId tableId;
private NamespaceId namespaceId;
@@ -36,14 +36,14 @@ class FinishCancelCompaction extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master environment) {
+ public Repo<Manager> call(long tid, Manager environment) {
Utils.unreserveTable(environment, tableId, tid, false);
Utils.unreserveNamespace(environment, namespaceId, tid, false);
return null;
}
@Override
- public void undo(long tid, Master environment) {
+ public void undo(long tid, Manager environment) {
}
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/ChooseDir.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/ChooseDir.java
index a531834..3fd74f3 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/ChooseDir.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/ChooseDir.java
@@ -26,8 +26,8 @@ import java.util.TreeSet;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.TableInfo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.tablets.UniqueNameAllocator;
@@ -38,7 +38,7 @@ import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class ChooseDir extends MasterRepo {
+class ChooseDir extends ManagerRepo {
private static final long serialVersionUID = 1L;
private final TableInfo tableInfo;
@@ -49,12 +49,12 @@ class ChooseDir extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) {
+ public long isReady(long tid, Manager environment) {
return 0;
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
if (tableInfo.getInitialSplitSize() > 0) {
createTableDirectoriesInfo(master);
}
@@ -62,7 +62,7 @@ class ChooseDir extends MasterRepo {
}
@Override
- public void undo(long tid, Master master) throws Exception {
+ public void undo(long tid, Manager master) throws Exception {
// Clean up split files if ChooseDir operation fails
Path p = null;
try {
@@ -81,7 +81,7 @@ class ChooseDir extends MasterRepo {
* Create unique table directory names that will be associated with split values. Then write these
* to the file system for later use during this FATE operation.
*/
- private void createTableDirectoriesInfo(Master master) throws IOException {
+ private void createTableDirectoriesInfo(Manager master) throws IOException {
SortedSet<Text> splits = Utils.getSortedSetFromFile(master, tableInfo.getSplitPath(), true);
SortedSet<Text> tabletDirectoryInfo = createTabletDirectoriesSet(master, splits.size());
writeTabletDirectoriesToFileSystem(master, tabletDirectoryInfo);
@@ -91,7 +91,7 @@ class ChooseDir extends MasterRepo {
* Create a set of unique table directories. These will be associated with splits in a follow-on
* FATE step.
*/
- private static SortedSet<Text> createTabletDirectoriesSet(Master master, int num) {
+ private static SortedSet<Text> createTabletDirectoriesSet(Manager master, int num) {
String tabletDir;
UniqueNameAllocator namer = master.getContext().getUniqueNameAllocator();
SortedSet<Text> splitDirs = new TreeSet<>();
@@ -106,7 +106,7 @@ class ChooseDir extends MasterRepo {
* Write the SortedSet of Tablet Directory names to the file system for use in the next phase of
* the FATE operation.
*/
- private void writeTabletDirectoriesToFileSystem(Master master, SortedSet<Text> dirs)
+ private void writeTabletDirectoriesToFileSystem(Manager master, SortedSet<Text> dirs)
throws IOException {
Path p = tableInfo.getSplitDirsPath();
FileSystem fs = p.getFileSystem(master.getContext().getHadoopConf());
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/CreateTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/CreateTable.java
index cd2762f..0025cbd 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/CreateTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/CreateTable.java
@@ -27,8 +27,8 @@ import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.TableInfo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.hadoop.fs.FileSystem;
@@ -36,7 +36,7 @@ import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CreateTable extends MasterRepo {
+public class CreateTable extends ManagerRepo {
private static final long serialVersionUID = 1L;
private static final Logger log = LoggerFactory.getLogger(CreateTable.class);
@@ -58,14 +58,14 @@ public class CreateTable extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) throws Exception {
+ public long isReady(long tid, Manager environment) throws Exception {
// reserve the table's namespace to make sure it doesn't change while the table is created
return Utils.reserveNamespace(environment, tableInfo.getNamespaceId(), tid, false, true,
TableOperation.CREATE);
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
// first step is to reserve a table id.. if the machine fails during this step
// it is ok to retry... the only side effect is that a table id may not be used
// or skipped
@@ -83,7 +83,7 @@ public class CreateTable extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) throws IOException {
+ public void undo(long tid, Manager env) throws IOException {
// Clean up split files if create table operation fails
Path p = null;
try {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/FinishCreateTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/FinishCreateTable.java
index b49c231..f6b17be 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/FinishCreateTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/FinishCreateTable.java
@@ -23,8 +23,8 @@ import java.io.IOException;
import org.apache.accumulo.core.client.admin.InitialTableState;
import org.apache.accumulo.core.manager.state.tables.TableState;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.TableInfo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.hadoop.fs.FileSystem;
@@ -32,7 +32,7 @@ import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class FinishCreateTable extends MasterRepo {
+class FinishCreateTable extends ManagerRepo {
private static final long serialVersionUID = 1L;
private static final Logger log = LoggerFactory.getLogger(FinishCreateTable.class);
@@ -44,12 +44,12 @@ class FinishCreateTable extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) {
+ public long isReady(long tid, Manager environment) {
return 0;
}
@Override
- public Repo<Master> call(long tid, Master env) throws Exception {
+ public Repo<Manager> call(long tid, Manager env) throws Exception {
if (tableInfo.getInitialTableState() == InitialTableState.OFFLINE) {
env.getContext().getTableManager().transitionTableState(tableInfo.getTableId(),
@@ -70,7 +70,7 @@ class FinishCreateTable extends MasterRepo {
return null;
}
- private void cleanupSplitFiles(Master env) throws IOException {
+ private void cleanupSplitFiles(Manager env) throws IOException {
// it is sufficient to delete from the parent, because both files are in the same directory, and
// we want to delete the directory also
Path p = null;
@@ -89,6 +89,6 @@ class FinishCreateTable extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) {}
+ public void undo(long tid, Manager env) {}
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
index 83f7280..d7c2653 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
@@ -37,8 +37,8 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Ta
import org.apache.accumulo.core.metadata.schema.MetadataTime;
import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.fate.zookeeper.ZooLock;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.TableInfo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.ServerContext;
@@ -48,7 +48,7 @@ import org.apache.hadoop.io.Text;
import com.google.common.base.Preconditions;
import com.google.common.collect.Iterables;
-class PopulateMetadata extends MasterRepo {
+class PopulateMetadata extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -59,12 +59,12 @@ class PopulateMetadata extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) {
+ public long isReady(long tid, Manager environment) {
return 0;
}
@Override
- public Repo<Master> call(long tid, Master env) throws Exception {
+ public Repo<Manager> call(long tid, Manager env) throws Exception {
KeyExtent extent = new KeyExtent(tableInfo.getTableId(), null, null);
MetadataTableUtil.addTablet(extent, ServerColumnFamily.DEFAULT_TABLET_DIR_NAME,
env.getContext(), tableInfo.getTimeType(), env.getMasterLock());
@@ -100,7 +100,7 @@ class PopulateMetadata extends MasterRepo {
}
@Override
- public void undo(long tid, Master environment) throws Exception {
+ public void undo(long tid, Manager environment) throws Exception {
MetadataTableUtil.deleteTable(tableInfo.getTableId(), false, environment.getContext(),
environment.getMasterLock());
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateZookeeper.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateZookeeper.java
index d2b433f..4ecd9f6 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateZookeeper.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateZookeeper.java
@@ -23,13 +23,13 @@ import java.util.Map.Entry;
import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.TableInfo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.util.TablePropUtil;
-class PopulateZookeeper extends MasterRepo {
+class PopulateZookeeper extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -40,13 +40,13 @@ class PopulateZookeeper extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) throws Exception {
+ public long isReady(long tid, Manager environment) throws Exception {
return Utils.reserveTable(environment, tableInfo.getTableId(), tid, true, false,
TableOperation.CREATE);
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
// reserve the table name in zookeeper or fail
Utils.getTableNameLock().lock();
@@ -71,7 +71,7 @@ class PopulateZookeeper extends MasterRepo {
}
@Override
- public void undo(long tid, Master master) throws Exception {
+ public void undo(long tid, Manager master) throws Exception {
master.getTableManager().removeTable(tableInfo.getTableId());
Utils.unreserveTable(master, tableInfo.getTableId(), tid, true);
Tables.clearCache(master.getContext());
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/SetupPermissions.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/SetupPermissions.java
index e6127a3..04f00c4 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/SetupPermissions.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/SetupPermissions.java
@@ -21,14 +21,14 @@ package org.apache.accumulo.manager.tableOps.create;
import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.TableInfo;
import org.apache.accumulo.server.security.AuditedSecurityOperation;
import org.apache.accumulo.server.security.SecurityOperation;
import org.slf4j.LoggerFactory;
-class SetupPermissions extends MasterRepo {
+class SetupPermissions extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -39,7 +39,7 @@ class SetupPermissions extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master env) throws Exception {
+ public Repo<Manager> call(long tid, Manager env) throws Exception {
// give all table permissions to the creator
SecurityOperation security = AuditedSecurityOperation.getInstance(env.getContext());
if (!tableInfo.getUser().equals(env.getContext().getCredentials().getPrincipal())) {
@@ -61,7 +61,7 @@ class SetupPermissions extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) throws Exception {
+ public void undo(long tid, Manager env) throws Exception {
AuditedSecurityOperation.getInstance(env.getContext()).deleteTable(env.getContext().rpcCreds(),
tableInfo.getTableId(), tableInfo.getNamespaceId());
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/CleanUp.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/CleanUp.java
index ee6d8d0..c3eb64e 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/CleanUp.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/CleanUp.java
@@ -43,8 +43,8 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.fs.VolumeManager;
@@ -56,7 +56,7 @@ import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class CleanUp extends MasterRepo {
+class CleanUp extends ManagerRepo {
private static final Logger log = LoggerFactory.getLogger(CleanUp.class);
@@ -86,7 +86,7 @@ class CleanUp extends MasterRepo {
}
@Override
- public long isReady(long tid, Master master) throws Exception {
+ public long isReady(long tid, Manager master) throws Exception {
if (!master.hasCycled(creationTime)) {
return 50;
}
@@ -118,7 +118,7 @@ class CleanUp extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) {
+ public Repo<Manager> call(long tid, Manager master) {
master.clearMigrations(tableId);
@@ -216,7 +216,7 @@ class CleanUp extends MasterRepo {
}
@Override
- public void undo(long tid, Master environment) {
+ public void undo(long tid, Manager environment) {
// nothing to do
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/DeleteTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/DeleteTable.java
index a0de0b9..2156663 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/DeleteTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/DeleteTable.java
@@ -23,11 +23,11 @@ import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.manager.state.tables.TableState;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
-public class DeleteTable extends MasterRepo {
+public class DeleteTable extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -40,20 +40,20 @@ public class DeleteTable extends MasterRepo {
}
@Override
- public long isReady(long tid, Master env) throws Exception {
+ public long isReady(long tid, Manager env) throws Exception {
return Utils.reserveNamespace(env, namespaceId, tid, false, false, TableOperation.DELETE)
+ Utils.reserveTable(env, tableId, tid, true, true, TableOperation.DELETE);
}
@Override
- public Repo<Master> call(long tid, Master env) {
+ public Repo<Manager> call(long tid, Manager env) {
env.getTableManager().transitionTableState(tableId, TableState.DELETING);
env.getEventCoordinator().event("deleting table %s ", tableId);
return new CleanUp(tableId, namespaceId);
}
@Override
- public void undo(long tid, Master env) {
+ public void undo(long tid, Manager env) {
Utils.unreserveTable(env, tableId, tid, true);
Utils.unreserveNamespace(env, namespaceId, tid, false);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/TableRangeOp.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/TableRangeOp.java
index c4ce5ff..d9a80ec 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/TableRangeOp.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/TableRangeOp.java
@@ -27,8 +27,8 @@ import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.manager.state.MergeInfo;
import org.apache.accumulo.server.manager.state.MergeInfo.Operation;
@@ -37,7 +37,7 @@ import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TableRangeOp extends MasterRepo {
+public class TableRangeOp extends ManagerRepo {
private static final Logger log = LoggerFactory.getLogger(TableRangeOp.class);
private static final long serialVersionUID = 1L;
@@ -49,7 +49,7 @@ public class TableRangeOp extends MasterRepo {
private Operation op;
@Override
- public long isReady(long tid, Master env) throws Exception {
+ public long isReady(long tid, Manager env) throws Exception {
return Utils.reserveNamespace(env, namespaceId, tid, false, true, TableOperation.MERGE)
+ Utils.reserveTable(env, tableId, tid, true, true, TableOperation.MERGE);
}
@@ -64,7 +64,7 @@ public class TableRangeOp extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master env) throws Exception {
+ public Repo<Manager> call(long tid, Manager env) throws Exception {
if (RootTable.ID.equals(tableId) && Operation.MERGE.equals(op)) {
log.warn("Attempt to merge tablets for {} does nothing. It is not splittable.",
@@ -93,7 +93,7 @@ public class TableRangeOp extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) throws Exception {
+ public void undo(long tid, Manager env) throws Exception {
// Not sure this is a good thing to do. The Master state engine should be the one to remove it.
MergeInfo mergeInfo = env.getMergeInfo(tableId);
if (mergeInfo.getState() != MergeState.NONE)
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/TableRangeOpWait.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/TableRangeOpWait.java
index 1a973ae..b4f354d 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/TableRangeOpWait.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/TableRangeOpWait.java
@@ -21,8 +21,8 @@ package org.apache.accumulo.manager.tableOps.merge;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.manager.state.MergeInfo;
import org.apache.accumulo.server.manager.state.MergeState;
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
* Normal operations, like bulk imports, will grab the read lock and prevent merges (writes) while
* they run. Merge operations will lock out some operations while they run.
*/
-class TableRangeOpWait extends MasterRepo {
+class TableRangeOpWait extends ManagerRepo {
private static final Logger log = LoggerFactory.getLogger(TableRangeOpWait.class);
private static final long serialVersionUID = 1L;
@@ -59,7 +59,7 @@ class TableRangeOpWait extends MasterRepo {
}
@Override
- public long isReady(long tid, Master env) {
+ public long isReady(long tid, Manager env) {
if (!env.getMergeInfo(tableId).getState().equals(MergeState.NONE)) {
return 50;
}
@@ -67,7 +67,7 @@ class TableRangeOpWait extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
MergeInfo mergeInfo = master.getMergeInfo(tableId);
log.info("removing merge information " + mergeInfo);
master.clearMergeState(tableId);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/CreateNamespace.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/CreateNamespace.java
index cab8327..b4e4c6a 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/CreateNamespace.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/CreateNamespace.java
@@ -22,11 +22,11 @@ import java.util.Map;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
-public class CreateNamespace extends MasterRepo {
+public class CreateNamespace extends ManagerRepo {
private static final long serialVersionUID = 1L;
private NamespaceInfo namespaceInfo;
@@ -39,12 +39,12 @@ public class CreateNamespace extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) {
+ public long isReady(long tid, Manager environment) {
return 0;
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
Utils.getIdLock().lock();
try {
namespaceInfo.namespaceId =
@@ -57,7 +57,7 @@ public class CreateNamespace extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) {
+ public void undo(long tid, Manager env) {
// nothing to do, the namespace id was allocated!
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/FinishCreateNamespace.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/FinishCreateNamespace.java
index aa694c4..54de53c 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/FinishCreateNamespace.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/FinishCreateNamespace.java
@@ -19,12 +19,12 @@
package org.apache.accumulo.manager.tableOps.namespace.create;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.slf4j.LoggerFactory;
-class FinishCreateNamespace extends MasterRepo {
+class FinishCreateNamespace extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -35,12 +35,12 @@ class FinishCreateNamespace extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) {
+ public long isReady(long tid, Manager environment) {
return 0;
}
@Override
- public Repo<Master> call(long id, Master env) {
+ public Repo<Manager> call(long id, Manager env) {
Utils.unreserveNamespace(env, namespaceInfo.namespaceId, id, true);
@@ -58,6 +58,6 @@ class FinishCreateNamespace extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) {}
+ public void undo(long tid, Manager env) {}
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/PopulateZookeeperWithNamespace.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/PopulateZookeeperWithNamespace.java
index e20f3a3..3011c59 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/PopulateZookeeperWithNamespace.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/PopulateZookeeperWithNamespace.java
@@ -24,13 +24,13 @@ import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.tables.TableManager;
import org.apache.accumulo.server.util.NamespacePropUtil;
-class PopulateZookeeperWithNamespace extends MasterRepo {
+class PopulateZookeeperWithNamespace extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -41,13 +41,13 @@ class PopulateZookeeperWithNamespace extends MasterRepo {
}
@Override
- public long isReady(long id, Master environment) throws Exception {
+ public long isReady(long id, Manager environment) throws Exception {
return Utils.reserveNamespace(environment, namespaceInfo.namespaceId, id, true, false,
TableOperation.CREATE);
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
Utils.getTableNameLock().lock();
try {
@@ -71,7 +71,7 @@ class PopulateZookeeperWithNamespace extends MasterRepo {
}
@Override
- public void undo(long tid, Master master) throws Exception {
+ public void undo(long tid, Manager master) throws Exception {
master.getTableManager().removeNamespace(namespaceInfo.namespaceId);
Tables.clearCache(master.getContext());
Utils.unreserveNamespace(master, namespaceInfo.namespaceId, tid, true);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/SetupNamespacePermissions.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/SetupNamespacePermissions.java
index d5496ca..f859782 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/SetupNamespacePermissions.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/SetupNamespacePermissions.java
@@ -21,13 +21,13 @@ package org.apache.accumulo.manager.tableOps.namespace.create;
import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.security.NamespacePermission;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.security.AuditedSecurityOperation;
import org.apache.accumulo.server.security.SecurityOperation;
import org.slf4j.LoggerFactory;
-class SetupNamespacePermissions extends MasterRepo {
+class SetupNamespacePermissions extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -38,7 +38,7 @@ class SetupNamespacePermissions extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master env) throws Exception {
+ public Repo<Manager> call(long tid, Manager env) throws Exception {
// give all namespace permissions to the creator
SecurityOperation security = AuditedSecurityOperation.getInstance(env.getContext());
for (var permission : NamespacePermission.values()) {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/DeleteNamespace.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/DeleteNamespace.java
index 82b9dac..7abf234 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/DeleteNamespace.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/DeleteNamespace.java
@@ -21,11 +21,11 @@ package org.apache.accumulo.manager.tableOps.namespace.delete;
import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
-public class DeleteNamespace extends MasterRepo {
+public class DeleteNamespace extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -36,18 +36,18 @@ public class DeleteNamespace extends MasterRepo {
}
@Override
- public long isReady(long id, Master environment) throws Exception {
+ public long isReady(long id, Manager environment) throws Exception {
return Utils.reserveNamespace(environment, namespaceId, id, true, true, TableOperation.DELETE);
}
@Override
- public Repo<Master> call(long tid, Master environment) {
+ public Repo<Manager> call(long tid, Manager environment) {
environment.getEventCoordinator().event("deleting namespace %s ", namespaceId);
return new NamespaceCleanUp(namespaceId);
}
@Override
- public void undo(long id, Master environment) {
+ public void undo(long id, Manager environment) {
Utils.unreserveNamespace(environment, namespaceId, id, true);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/NamespaceCleanUp.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/NamespaceCleanUp.java
index 618d45f..4bab467 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/NamespaceCleanUp.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/delete/NamespaceCleanUp.java
@@ -22,14 +22,14 @@ import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.security.AuditedSecurityOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class NamespaceCleanUp extends MasterRepo {
+class NamespaceCleanUp extends ManagerRepo {
private static final Logger log = LoggerFactory.getLogger(NamespaceCleanUp.class);
@@ -42,12 +42,12 @@ class NamespaceCleanUp extends MasterRepo {
}
@Override
- public long isReady(long tid, Master master) {
+ public long isReady(long tid, Manager master) {
return 0;
}
@Override
- public Repo<Master> call(long id, Master master) {
+ public Repo<Manager> call(long id, Manager master) {
// remove from zookeeper
try {
@@ -73,7 +73,7 @@ class NamespaceCleanUp extends MasterRepo {
}
@Override
- public void undo(long tid, Master environment) {
+ public void undo(long tid, Manager environment) {
// nothing to do
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java
index ff29b32..e6ba512 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java
@@ -28,12 +28,12 @@ import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.slf4j.LoggerFactory;
-public class RenameNamespace extends MasterRepo {
+public class RenameNamespace extends ManagerRepo {
private static final long serialVersionUID = 1L;
private NamespaceId namespaceId;
@@ -41,7 +41,7 @@ public class RenameNamespace extends MasterRepo {
private String newName;
@Override
- public long isReady(long id, Master environment) throws Exception {
+ public long isReady(long id, Manager environment) throws Exception {
return Utils.reserveNamespace(environment, namespaceId, id, true, true, TableOperation.RENAME);
}
@@ -52,7 +52,7 @@ public class RenameNamespace extends MasterRepo {
}
@Override
- public Repo<Master> call(long id, Master master) throws Exception {
+ public Repo<Manager> call(long id, Manager master) throws Exception {
ZooReaderWriter zoo = master.getContext().getZooReaderWriter();
@@ -87,7 +87,7 @@ public class RenameNamespace extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) {
+ public void undo(long tid, Manager env) {
Utils.unreserveNamespace(env, namespaceId, tid, true);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java
index 967dd8e..9abc62f 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java
@@ -32,12 +32,12 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.slf4j.LoggerFactory;
-public class RenameTable extends MasterRepo {
+public class RenameTable extends ManagerRepo {
private static final long serialVersionUID = 1L;
private TableId tableId;
@@ -46,7 +46,7 @@ public class RenameTable extends MasterRepo {
private String newTableName;
@Override
- public long isReady(long tid, Master env) throws Exception {
+ public long isReady(long tid, Manager env) throws Exception {
return Utils.reserveNamespace(env, namespaceId, tid, false, true, TableOperation.RENAME)
+ Utils.reserveTable(env, tableId, tid, true, true, TableOperation.RENAME);
}
@@ -60,7 +60,7 @@ public class RenameTable extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
Pair<String,String> qualifiedOldTableName = Tables.qualify(oldTableName);
Pair<String,String> qualifiedNewTableName = Tables.qualify(newTableName);
@@ -109,7 +109,7 @@ public class RenameTable extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) {
+ public void undo(long tid, Manager env) {
Utils.unreserveTable(env, tableId, tid, true);
Utils.unreserveNamespace(env, namespaceId, tid, false);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/ExportTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/ExportTable.java
index d8316e1..58afa9a 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/ExportTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/ExportTable.java
@@ -21,12 +21,12 @@ package org.apache.accumulo.manager.tableOps.tableExport;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.hadoop.fs.Path;
-public class ExportTable extends MasterRepo {
+public class ExportTable extends ManagerRepo {
private static final long serialVersionUID = 1L;
private final ExportInfo tableInfo;
@@ -40,17 +40,17 @@ public class ExportTable extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) throws Exception {
+ public long isReady(long tid, Manager environment) throws Exception {
return Utils.reserveHdfsDirectory(environment, new Path(tableInfo.exportDir).toString(), tid);
}
@Override
- public Repo<Master> call(long tid, Master env) {
+ public Repo<Manager> call(long tid, Manager env) {
return new WriteExportFiles(tableInfo);
}
@Override
- public void undo(long tid, Master env) throws Exception {
+ public void undo(long tid, Manager env) throws Exception {
Utils.unreserveHdfsDirectory(env, new Path(tableInfo.exportDir).toString(), tid);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/WriteExportFiles.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/WriteExportFiles.java
index 4098cbac..94b1f69 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/WriteExportFiles.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/WriteExportFiles.java
@@ -59,8 +59,8 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Se
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.ServerContext;
@@ -69,7 +69,7 @@ import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.Path;
-class WriteExportFiles extends MasterRepo {
+class WriteExportFiles extends ManagerRepo {
private static final long serialVersionUID = 1L;
private final ExportInfo tableInfo;
@@ -90,7 +90,7 @@ class WriteExportFiles extends MasterRepo {
}
@Override
- public long isReady(long tid, Master master) throws Exception {
+ public long isReady(long tid, Manager master) throws Exception {
long reserved = Utils.reserveNamespace(master, tableInfo.namespaceID, tid, false, true,
TableOperation.EXPORT)
@@ -130,7 +130,7 @@ class WriteExportFiles extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
try {
exportTable(master.getVolumeManager(), master.getContext(), tableInfo.tableName,
tableInfo.tableID, tableInfo.exportDir);
@@ -146,7 +146,7 @@ class WriteExportFiles extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) {
+ public void undo(long tid, Manager env) {
Utils.unreserveNamespace(env, tableInfo.namespaceID, tid, false);
Utils.unreserveTable(env, tableInfo.tableID, tid, false);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/CreateImportDir.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/CreateImportDir.java
index 5e1b751..b8d33e4 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/CreateImportDir.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/CreateImportDir.java
@@ -23,15 +23,15 @@ import java.util.Set;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.tablets.UniqueNameAllocator;
import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class CreateImportDir extends MasterRepo {
+class CreateImportDir extends ManagerRepo {
private static final Logger log = LoggerFactory.getLogger(CreateImportDir.class);
private static final long serialVersionUID = 1L;
@@ -42,7 +42,7 @@ class CreateImportDir extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
Set<String> tableDirs = ServerConstants.getTablesDirs(master.getContext());
@@ -63,7 +63,7 @@ class CreateImportDir extends MasterRepo {
* @throws IOException
* if any import directory does not reside on a volume configured for accumulo.
*/
- void create(Set<String> tableDirs, Master master) throws IOException {
+ void create(Set<String> tableDirs, Manager master) throws IOException {
UniqueNameAllocator namer = master.getContext().getUniqueNameAllocator();
for (ImportedTableInfo.DirectoryMapping dm : tableInfo.directories) {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/FinishImportTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/FinishImportTable.java
index 04353aa..8f4c71a 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/FinishImportTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/FinishImportTable.java
@@ -20,13 +20,13 @@ package org.apache.accumulo.manager.tableOps.tableImport;
import org.apache.accumulo.core.manager.state.tables.TableState;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.hadoop.fs.Path;
import org.slf4j.LoggerFactory;
-class FinishImportTable extends MasterRepo {
+class FinishImportTable extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -37,12 +37,12 @@ class FinishImportTable extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) {
+ public long isReady(long tid, Manager environment) {
return 0;
}
@Override
- public Repo<Master> call(long tid, Master env) throws Exception {
+ public Repo<Manager> call(long tid, Manager env) throws Exception {
for (ImportedTableInfo.DirectoryMapping dm : tableInfo.directories) {
env.getVolumeManager().deleteRecursively(new Path(dm.importDir, "mappings.txt"));
@@ -71,6 +71,6 @@ class FinishImportTable extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) {}
+ public void undo(long tid, Manager env) {}
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportPopulateZookeeper.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportPopulateZookeeper.java
index d7bf4d1..76506ab 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportPopulateZookeeper.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportPopulateZookeeper.java
@@ -30,15 +30,15 @@ import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.util.TablePropUtil;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-class ImportPopulateZookeeper extends MasterRepo {
+class ImportPopulateZookeeper extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -49,7 +49,7 @@ class ImportPopulateZookeeper extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) throws Exception {
+ public long isReady(long tid, Manager environment) throws Exception {
return Utils.reserveTable(environment, tableInfo.tableId, tid, true, false,
TableOperation.IMPORT);
}
@@ -69,7 +69,7 @@ class ImportPopulateZookeeper extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master env) throws Exception {
+ public Repo<Manager> call(long tid, Manager env) throws Exception {
// reserve the table name in zookeeper or fail
Utils.getTableNameLock().lock();
@@ -100,7 +100,7 @@ class ImportPopulateZookeeper extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) throws Exception {
+ public void undo(long tid, Manager env) throws Exception {
env.getTableManager().removeTable(tableInfo.tableId);
Utils.unreserveTable(env, tableInfo.tableId, tid, true);
Tables.clearCache(env.getContext());
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportSetupPermissions.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportSetupPermissions.java
index e56c902..8944d66 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportSetupPermissions.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportSetupPermissions.java
@@ -21,13 +21,13 @@ package org.apache.accumulo.manager.tableOps.tableImport;
import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.security.AuditedSecurityOperation;
import org.apache.accumulo.server.security.SecurityOperation;
import org.slf4j.LoggerFactory;
-class ImportSetupPermissions extends MasterRepo {
+class ImportSetupPermissions extends ManagerRepo {
private static final long serialVersionUID = 1L;
@@ -38,12 +38,12 @@ class ImportSetupPermissions extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) {
+ public long isReady(long tid, Manager environment) {
return 0;
}
@Override
- public Repo<Master> call(long tid, Master env) throws Exception {
+ public Repo<Manager> call(long tid, Manager env) throws Exception {
// give all table permissions to the creator
SecurityOperation security = AuditedSecurityOperation.getInstance(env.getContext());
for (TablePermission permission : TablePermission.values()) {
@@ -63,7 +63,7 @@ class ImportSetupPermissions extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) throws Exception {
+ public void undo(long tid, Manager env) throws Exception {
AuditedSecurityOperation.getInstance(env.getContext()).deleteTable(env.getContext().rpcCreds(),
tableInfo.tableId, tableInfo.namespaceId);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportTable.java
index a0472d9..39eb0db 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/ImportTable.java
@@ -40,8 +40,8 @@ import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.manager.tableOps.Utils;
import org.apache.accumulo.manager.tableOps.tableExport.ExportTable;
import org.apache.accumulo.server.ServerConstants;
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-public class ImportTable extends MasterRepo {
+public class ImportTable extends ManagerRepo {
private static final Logger log = LoggerFactory.getLogger(ImportTable.class);
private static final long serialVersionUID = 2L;
@@ -68,7 +68,7 @@ public class ImportTable extends MasterRepo {
}
@Override
- public long isReady(long tid, Master environment) throws Exception {
+ public long isReady(long tid, Manager environment) throws Exception {
long result = 0;
for (ImportedTableInfo.DirectoryMapping dm : tableInfo.directories) {
result += Utils.reserveHdfsDirectory(environment, new Path(dm.exportDir).toString(), tid);
@@ -79,7 +79,7 @@ public class ImportTable extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master env) throws Exception {
+ public Repo<Manager> call(long tid, Manager env) throws Exception {
checkVersions(env);
// first step is to reserve a table id.. if the machine fails during this step
@@ -99,7 +99,7 @@ public class ImportTable extends MasterRepo {
@SuppressFBWarnings(value = "OS_OPEN_STREAM",
justification = "closing intermediate readers would close the ZipInputStream")
- public void checkVersions(Master env) throws AcceptableThriftTableOperationException {
+ public void checkVersions(Manager env) throws AcceptableThriftTableOperationException {
Set<String> exportDirs =
tableInfo.directories.stream().map(dm -> dm.exportDir).collect(Collectors.toSet());
@@ -149,7 +149,7 @@ public class ImportTable extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) throws Exception {
+ public void undo(long tid, Manager env) throws Exception {
for (ImportedTableInfo.DirectoryMapping dm : tableInfo.directories) {
Utils.unreserveHdfsDirectory(env, new Path(dm.exportDir).toString(), tid);
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MapImportFileNames.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MapImportFileNames.java
index 08caafc..542bd95 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MapImportFileNames.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MapImportFileNames.java
@@ -30,8 +30,8 @@ import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
import org.apache.accumulo.core.file.FileOperations;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.tablets.UniqueNameAllocator;
import org.apache.hadoop.fs.FileStatus;
@@ -39,7 +39,7 @@ import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class MapImportFileNames extends MasterRepo {
+class MapImportFileNames extends ManagerRepo {
private static final Logger log = LoggerFactory.getLogger(MapImportFileNames.class);
private static final long serialVersionUID = 1L;
@@ -51,7 +51,7 @@ class MapImportFileNames extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master environment) throws Exception {
+ public Repo<Manager> call(long tid, Manager environment) throws Exception {
for (ImportedTableInfo.DirectoryMapping dm : tableInfo.directories) {
Path path = new Path(dm.importDir, "mappings.txt");
@@ -114,7 +114,7 @@ class MapImportFileNames extends MasterRepo {
}
@Override
- public void undo(long tid, Master env) throws Exception {
+ public void undo(long tid, Manager env) throws Exception {
// TODO: will this be OK for partially complete operations?
for (ImportedTableInfo.DirectoryMapping dm : tableInfo.directories) {
env.getVolumeManager().deleteRecursively(new Path(dm.importDir));
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MoveExportedFiles.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MoveExportedFiles.java
index eb2d874..20bd0dd 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MoveExportedFiles.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/MoveExportedFiles.java
@@ -33,8 +33,8 @@ import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.fate.FateTxId;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
-class MoveExportedFiles extends MasterRepo {
+class MoveExportedFiles extends ManagerRepo {
private static final Logger log = LoggerFactory.getLogger(MoveExportedFiles.class);
private static final long serialVersionUID = 1L;
@@ -55,7 +55,7 @@ class MoveExportedFiles extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
String fmtTid = FateTxId.formatTid(tid);
int workerCount = master.getConfiguration().getCount(Property.MANAGER_RENAME_THREADS);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/PopulateMetadataTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/PopulateMetadataTable.java
index 3d17d7e..4868f1d 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/PopulateMetadataTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/PopulateMetadataTable.java
@@ -46,8 +46,8 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Se
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
import org.apache.accumulo.core.util.FastFormat;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.hadoop.fs.Path;
@@ -55,7 +55,7 @@ import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class PopulateMetadataTable extends MasterRepo {
+class PopulateMetadataTable extends ManagerRepo {
private static final Logger log = LoggerFactory.getLogger(PopulateMetadataTable.class);
private static final long serialVersionUID = 1L;
@@ -87,7 +87,7 @@ class PopulateMetadataTable extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
Path path = new Path(tableInfo.exportFile);
@@ -204,7 +204,7 @@ class PopulateMetadataTable extends MasterRepo {
}
@Override
- public void undo(long tid, Master environment) throws Exception {
+ public void undo(long tid, Manager environment) throws Exception {
MetadataTableUtil.deleteTable(tableInfo.tableId, false, environment.getContext(),
environment.getMasterLock());
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java b/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java
index 269931b..314abd0 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java
@@ -28,14 +28,14 @@ import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.fate.zookeeper.ZooLock;
import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.manager.LiveTServerSet.TServerConnection;
import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ShutdownTServer extends MasterRepo {
+public class ShutdownTServer extends ManagerRepo {
private static final long serialVersionUID = 2L;
private static final Logger log = LoggerFactory.getLogger(ShutdownTServer.class);
@@ -50,7 +50,7 @@ public class ShutdownTServer extends MasterRepo {
}
@Override
- public long isReady(long tid, Master master) {
+ public long isReady(long tid, Manager master) {
TServerInstance server = new TServerInstance(hostAndPort, serverSession);
// suppress assignment of tablets to the server
if (force) {
@@ -88,7 +88,7 @@ public class ShutdownTServer extends MasterRepo {
}
@Override
- public Repo<Master> call(long tid, Master master) throws Exception {
+ public Repo<Manager> call(long tid, Manager master) throws Exception {
// suppress assignment of tablets to the server
if (force) {
ZooReaderWriter zoo = master.getContext().getZooReaderWriter();
@@ -102,5 +102,5 @@ public class ShutdownTServer extends MasterRepo {
}
@Override
- public void undo(long tid, Master m) {}
+ public void undo(long tid, Manager m) {}
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/util/FateAdmin.java b/server/manager/src/main/java/org/apache/accumulo/manager/util/FateAdmin.java
index dc256b7..2ea268b 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/util/FateAdmin.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/util/FateAdmin.java
@@ -30,7 +30,7 @@ import org.apache.accumulo.fate.AdminUtil;
import org.apache.accumulo.fate.ReadOnlyStore;
import org.apache.accumulo.fate.ZooStore;
import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.server.ServerContext;
import com.beust.jcommander.JCommander;
@@ -77,14 +77,14 @@ public class FateAdmin {
+ " available within 'accumulo shell'%n$ fate fail <txid>... | delete"
+ " <txid>... | print [<txid>...]%n%n");
- AdminUtil<Master> admin = new AdminUtil<>();
+ AdminUtil<Manager> admin = new AdminUtil<>();
try (var context = new ServerContext(SiteConfiguration.auto())) {
final String zkRoot = context.getZooKeeperRoot();
String path = zkRoot + Constants.ZFATE;
String masterPath = zkRoot + Constants.ZMASTER_LOCK;
ZooReaderWriter zk = context.getZooReaderWriter();
- ZooStore<Master> zs = new ZooStore<>(path, zk);
+ ZooStore<Manager> zs = new ZooStore<>(path, zk);
if (jc.getParsedCommand().equals("fail")) {
for (String txid : txOpts.get(jc.getParsedCommand()).txids) {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/MasterMetrics.java b/server/manager/src/main/java/org/apache/accumulo/master/Master.java
similarity index 55%
rename from server/manager/src/main/java/org/apache/accumulo/manager/metrics/MasterMetrics.java
rename to server/manager/src/main/java/org/apache/accumulo/master/Master.java
index 2719f7f..b78ed73 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/MasterMetrics.java
+++ b/server/manager/src/main/java/org/apache/accumulo/master/Master.java
@@ -16,14 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.manager.metrics;
+package org.apache.accumulo.master;
-import org.apache.accumulo.server.metrics.Metrics;
+import org.apache.accumulo.manager.MasterExecutable;
+import org.apache.accumulo.start.Main;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-public abstract class MasterMetrics extends Metrics {
+/**
+ * @deprecated since 2.1.0. Use {@link Main} with keyword "manager" instead.
+ */
+@Deprecated(since = "2.1.0")
+public class Master {
+ private static final Logger LOG = LoggerFactory.getLogger(Master.class);
- protected MasterMetrics(String subName, String description, String record) {
- super("Master,sub=" + subName, description, "master", record);
+ public static void main(String[] args) throws Exception {
+ LOG.warn("Usage of {} directly has been deprecated. Use {} with keyword manager instead.",
+ Master.class.getName(), Main.class.getName());
+ new MasterExecutable().execute(args);
}
-
}
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/metrics/ReplicationMetricsTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/metrics/ReplicationMetricsTest.java
index 74ce417..ba7cfa1 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/metrics/ReplicationMetricsTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/metrics/ReplicationMetricsTest.java
@@ -21,7 +21,7 @@ package org.apache.accumulo.manager.metrics;
import java.lang.reflect.Field;
import java.util.Set;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.replication.ReplicationUtil;
@@ -39,7 +39,7 @@ public class ReplicationMetricsTest {
* Extend the class to override the current time for testing
*/
public class ReplicationMetricsTestMetrics extends ReplicationMetrics {
- ReplicationMetricsTestMetrics(Master master) {
+ ReplicationMetricsTestMetrics(Manager master) {
super(master);
}
@@ -51,7 +51,7 @@ public class ReplicationMetricsTest {
@Test
public void testAddReplicationQueueTimeMetrics() throws Exception {
- Master master = EasyMock.createMock(Master.class);
+ Manager master = EasyMock.createMock(Manager.class);
ServerContext context = EasyMock.createMock(ServerContext.class);
VolumeManager fileSystem = EasyMock.createMock(VolumeManager.class);
ReplicationUtil util = EasyMock.createMock(ReplicationUtil.class);
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/replication/MasterReplicationCoordinatorTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/replication/ManagerReplicationCoordinatorTest.java
similarity index 87%
rename from server/manager/src/test/java/org/apache/accumulo/manager/replication/MasterReplicationCoordinatorTest.java
rename to server/manager/src/test/java/org/apache/accumulo/manager/replication/ManagerReplicationCoordinatorTest.java
index cbc953d..32d1bb8 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/replication/MasterReplicationCoordinatorTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/replication/ManagerReplicationCoordinatorTest.java
@@ -28,18 +28,18 @@ import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.metadata.TServerInstance;
import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.fate.zookeeper.ZooReader;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.server.ServerContext;
import org.easymock.EasyMock;
import org.junit.Test;
-public class MasterReplicationCoordinatorTest {
+public class ManagerReplicationCoordinatorTest {
static AccumuloConfiguration config = DefaultConfiguration.getInstance();
@Test
public void randomServer() {
- Master master = EasyMock.createMock(Master.class);
+ Manager master = EasyMock.createMock(Manager.class);
ZooReader reader = EasyMock.createMock(ZooReader.class);
ServerContext context = EasyMock.createMock(ServerContext.class);
EasyMock.expect(context.getConfiguration()).andReturn(config).anyTimes();
@@ -47,7 +47,7 @@ public class MasterReplicationCoordinatorTest {
EasyMock.expect(master.getInstanceID()).andReturn("1234");
EasyMock.replay(master, reader);
- MasterReplicationCoordinator coordinator = new MasterReplicationCoordinator(master, reader);
+ ManagerReplicationCoordinator coordinator = new ManagerReplicationCoordinator(master, reader);
TServerInstance inst1 = new TServerInstance(HostAndPort.fromParts("host1", 1234), "session");
assertEquals(inst1, coordinator.getRandomTServer(Collections.singleton(inst1), 0));
@@ -55,7 +55,7 @@ public class MasterReplicationCoordinatorTest {
@Test(expected = IllegalArgumentException.class)
public void invalidOffset() {
- Master master = EasyMock.createMock(Master.class);
+ Manager master = EasyMock.createMock(Manager.class);
ServerContext context = EasyMock.createMock(ServerContext.class);
EasyMock.expect(context.getConfiguration()).andReturn(config).anyTimes();
ZooReader reader = EasyMock.createMock(ZooReader.class);
@@ -63,7 +63,7 @@ public class MasterReplicationCoordinatorTest {
EasyMock.expect(master.getInstanceID()).andReturn("1234");
EasyMock.replay(master, reader);
- MasterReplicationCoordinator coordinator = new MasterReplicationCoordinator(master, reader);
+ ManagerReplicationCoordinator coordinator = new ManagerReplicationCoordinator(master, reader);
TServerInstance inst1 = new TServerInstance(HostAndPort.fromParts("host1", 1234), "session");
assertEquals(inst1, coordinator.getRandomTServer(Collections.singleton(inst1), 1));
@@ -71,7 +71,7 @@ public class MasterReplicationCoordinatorTest {
@Test
public void randomServerFromMany() {
- Master master = EasyMock.createMock(Master.class);
+ Manager master = EasyMock.createMock(Manager.class);
ZooReader reader = EasyMock.createMock(ZooReader.class);
ServerContext context = EasyMock.createMock(ServerContext.class);
EasyMock.expect(context.getConfiguration()).andReturn(config).anyTimes();
@@ -81,7 +81,7 @@ public class MasterReplicationCoordinatorTest {
EasyMock.expect(master.getContext()).andReturn(context).anyTimes();
EasyMock.replay(master, context, reader);
- MasterReplicationCoordinator coordinator = new MasterReplicationCoordinator(master, reader);
+ ManagerReplicationCoordinator coordinator = new ManagerReplicationCoordinator(master, reader);
EasyMock.verify(master, reader);
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/ShutdownTServerTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/ShutdownTServerTest.java
index cb71bc2..6fd367f 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/ShutdownTServerTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/ShutdownTServerTest.java
@@ -29,7 +29,7 @@ import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.metadata.TServerInstance;
import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.fate.Repo;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.manager.tserverOps.ShutdownTServer;
import org.apache.accumulo.server.manager.LiveTServerSet.TServerConnection;
import org.easymock.EasyMock;
@@ -45,7 +45,7 @@ public class ShutdownTServerTest {
final ShutdownTServer op = new ShutdownTServer(tserver, force);
- final Master master = EasyMock.createMock(Master.class);
+ final Manager master = EasyMock.createMock(Manager.class);
final long tid = 1L;
final TServerConnection tserverCnxn = EasyMock.createMock(TServerConnection.class);
@@ -88,7 +88,7 @@ public class ShutdownTServerTest {
wait = op.isReady(tid, master);
assertTrue("Expected wait to be 0", wait == 0);
- Repo<Master> op2 = op.call(tid, master);
+ Repo<Manager> op2 = op.call(tid, master);
assertNull("Expected no follow on step", op2);
EasyMock.verify(tserverCnxn, master);
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/tableImport/ImportTableTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/tableImport/ImportTableTest.java
index 3dea9f6..1f07a00 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/tableImport/ImportTableTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/tableImport/ImportTableTest.java
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.TableId;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.tablets.UniqueNameAllocator;
@@ -75,7 +75,7 @@ public class ImportTableTest {
@Test
public void testCreateImportDir() throws Exception {
- Master master = EasyMock.createMock(Master.class);
+ Manager master = EasyMock.createMock(Manager.class);
ServerContext context = EasyMock.createMock(ServerContext.class);
VolumeManager volumeManager = EasyMock.createMock(VolumeManager.class);
UniqueNameAllocator uniqueNameAllocator = EasyMock.createMock(UniqueNameAllocator.class);
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 bbdcd06..a8a3c47 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
@@ -43,13 +43,13 @@ import java.util.concurrent.atomic.AtomicLong;
import javax.inject.Singleton;
import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.gc.thrift.GCMonitorService;
import org.apache.accumulo.core.gc.thrift.GCStatus;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.rpc.ThriftUtil;
@@ -158,7 +158,7 @@ public class Monitor extends AbstractServer implements HighlyAvailableService {
private EventCounter dataCacheRequestTracker = new EventCounter();
private final AtomicBoolean fetching = new AtomicBoolean(false);
- private MasterMonitorInfo mmi;
+ private ManagerMonitorInfo mmi;
private Map<TableId,Map<ProblemType,Integer>> problemSummary = Collections.emptyMap();
private Exception problemException;
private GCStatus gcStatus;
@@ -251,11 +251,11 @@ public class Monitor extends AbstractServer implements HighlyAvailableService {
// Otherwise, we'll never release the lock by unsetting 'fetching' in the the finally block
try {
while (retry) {
- MasterClientService.Iface client = null;
+ ManagerClientService.Iface client = null;
try {
- client = MasterClient.getConnection(context);
+ client = ManagerClient.getConnection(context);
if (client != null) {
- mmi = client.getMasterStats(TraceUtil.traceInfo(), context.rpcCreds());
+ mmi = client.getManagerStats(TraceUtil.traceInfo(), context.rpcCreds());
retry = false;
} else {
mmi = null;
@@ -267,7 +267,7 @@ public class Monitor extends AbstractServer implements HighlyAvailableService {
log.info("Error fetching stats: ", e);
} finally {
if (client != null) {
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
if (mmi == null) {
@@ -705,7 +705,7 @@ public class Monitor extends AbstractServer implements HighlyAvailableService {
}
}
- public MasterMonitorInfo getMmi() {
+ public ManagerMonitorInfo getMmi() {
return mmi;
}
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java
index 037d297..cb6959d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java
@@ -24,7 +24,7 @@ import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.accumulo.monitor.rest.logs.DeadLoggerList;
-import org.apache.accumulo.monitor.rest.manager.MasterInformation;
+import org.apache.accumulo.monitor.rest.manager.ManagerInformation;
import org.apache.accumulo.monitor.rest.tables.TableInformationList;
import org.apache.accumulo.monitor.rest.tservers.BadTabletServers;
import org.apache.accumulo.monitor.rest.tservers.DeadServerList;
@@ -67,7 +67,7 @@ public class SummaryInformation {
* @param tablesList
* Table list
*/
- public SummaryInformation(int size, MasterInformation info, TableInformationList tablesList) {
+ public SummaryInformation(int size, ManagerInformation info, TableInformationList tablesList) {
this.servers = new ArrayList<>(size);
this.masterGoalState = info.masterGoalState;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
index c0a963d..48f1ee5 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
@@ -26,10 +26,10 @@ import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response.Status;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.monitor.Monitor;
-import org.apache.accumulo.monitor.rest.manager.MasterResource;
+import org.apache.accumulo.monitor.rest.manager.ManagerResource;
import org.apache.accumulo.monitor.rest.tables.TablesResource;
import org.apache.accumulo.monitor.rest.tservers.TabletServer;
@@ -52,14 +52,14 @@ public class XMLResource {
*/
public SummaryInformation getInformation() {
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi == null) {
throw new WebApplicationException(Status.INTERNAL_SERVER_ERROR);
}
// Add Monitor information
SummaryInformation xml = new SummaryInformation(mmi.tServerInfo.size(),
- MasterResource.getTables(monitor), TablesResource.getTables(monitor));
+ ManagerResource.getTables(monitor), TablesResource.getTables(monitor));
// Add tserver information
for (TabletServerStatus status : mmi.tServerInfo) {
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
index 08d42b8..568d432 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
@@ -27,7 +27,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.apache.accumulo.core.master.thrift.BulkImportStatus;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.monitor.Monitor;
@@ -52,7 +52,7 @@ public class BulkImportResource {
@GET
public BulkImport getTables() {
BulkImport bulkImport = new BulkImport();
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi == null)
return bulkImport;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/MasterInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerInformation.java
similarity index 96%
rename from server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/MasterInformation.java
rename to server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerInformation.java
index d989d41..e425e9c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/MasterInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerInformation.java
@@ -28,7 +28,7 @@ import org.apache.accumulo.monitor.rest.tservers.ServersShuttingDown;
*
* @since 2.0.0
*/
-public class MasterInformation {
+public class ManagerInformation {
// Variable names become JSON keys
public String master = "No Masters running";
@@ -63,9 +63,9 @@ public class MasterInformation {
/**
* Creates an empty master JSON object
*/
- public MasterInformation() {}
+ public ManagerInformation() {}
- public MasterInformation(String master) {
+ public ManagerInformation(String master) {
this.master = master;
}
@@ -119,7 +119,7 @@ public class MasterInformation {
* @param deadLoggers
* Number of dead loggers
*/
- public MasterInformation(String master, int onlineTabletServers, int totalTabletServers,
+ public ManagerInformation(String master, int onlineTabletServers, int totalTabletServers,
String lastGC, int tablets, int unassignedTablets, long entries, double ingest,
double entriesRead, double entriesReturned, long holdTime, double osLoad, int tables,
int deadTabletServersCount, long lookups, long uptime, String gcStatus,
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/MasterResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerResource.java
similarity index 91%
rename from server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/MasterResource.java
rename to server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerResource.java
index 209771e..409bdf4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/MasterResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerResource.java
@@ -32,7 +32,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.core.master.thrift.DeadServer;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.util.AddressUtil;
import org.apache.accumulo.monitor.Monitor;
@@ -53,7 +53,7 @@ import org.apache.accumulo.server.manager.state.TabletServerState;
*/
@Path("/master")
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class MasterResource {
+public class ManagerResource {
public static final String NO_MASTERS = "No Masters running";
@Inject
@@ -65,13 +65,13 @@ public class MasterResource {
* @return master JSON object
*/
@GET
- public MasterInformation getTables() {
+ public ManagerInformation getTables() {
return getTables(monitor);
}
- public static MasterInformation getTables(Monitor monitor) {
- MasterInformation masterInformation;
- MasterMonitorInfo mmi = monitor.getMmi();
+ public static ManagerInformation getTables(Monitor monitor) {
+ ManagerInformation managerInformation;
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi != null) {
GCStatus gcStatusObj = monitor.getGcStatus();
@@ -119,15 +119,15 @@ public class MasterResource {
long lookups = monitor.getTotalLookups();
long uptime = System.currentTimeMillis() - monitor.getStartTime();
- masterInformation = new MasterInformation(master, onlineTabletServers, totalTabletServers,
+ managerInformation = new ManagerInformation(master, onlineTabletServers, totalTabletServers,
gcStatus, tablets, unassignedTablets, entries, ingest, entriesRead, entriesReturned,
holdTime, osLoad, tables, deadTabletServers, lookups, uptime, label,
getGoalState(monitor), getState(monitor), getNumBadTservers(monitor),
getServersShuttingDown(monitor), getDeadTservers(monitor), getDeadLoggers(monitor));
} else {
- masterInformation = new MasterInformation();
+ managerInformation = new ManagerInformation();
}
- return masterInformation;
+ return managerInformation;
}
/**
@@ -136,7 +136,7 @@ public class MasterResource {
* @return master state
*/
public static String getState(Monitor monitor) {
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi == null) {
return NO_MASTERS;
}
@@ -149,7 +149,7 @@ public class MasterResource {
* @return master goal state
*/
public static String getGoalState(Monitor monitor) {
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi == null) {
return NO_MASTERS;
}
@@ -162,7 +162,7 @@ public class MasterResource {
* @return dead server list
*/
public static DeadServerList getDeadTservers(Monitor monitor) {
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi == null) {
return new DeadServerList();
}
@@ -182,7 +182,7 @@ public class MasterResource {
* @return dead logger list
*/
public static DeadLoggerList getDeadLoggers(Monitor monitor) {
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi == null) {
return new DeadLoggerList();
}
@@ -202,7 +202,7 @@ public class MasterResource {
* @return bad tserver list
*/
public static BadTabletServers getNumBadTservers(Monitor monitor) {
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi == null) {
return new BadTabletServers();
}
@@ -234,7 +234,7 @@ public class MasterResource {
* @return servers shutting down list
*/
public static ServersShuttingDown getServersShuttingDown(Monitor monitor) {
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
ServersShuttingDown servers = new ServersShuttingDown();
if (mmi == null)
return servers;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java
index 5099be5..d38ef80 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java
@@ -26,7 +26,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.monitor.Monitor;
@@ -52,7 +52,7 @@ public class ScansResource {
@GET
public Scans getTables() {
Scans scans = new Scans();
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi == null) {
return scans;
}
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
index 9c5e2d2..f9a8d35 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
@@ -26,7 +26,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.monitor.Monitor;
/**
@@ -56,7 +56,7 @@ public class StatusResource {
Status masterStatus;
Status gcStatus;
Status tServerStatus = Status.ERROR;
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi != null) {
if (monitor.getGcStatus() != null) {
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
index 90354b7..39e6e0d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
@@ -40,7 +40,7 @@ import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.manager.state.tables.TableState;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.metadata.MetadataTable;
@@ -81,7 +81,7 @@ public class TablesResource {
public static TableInformationList getTables(Monitor monitor) {
TableInformationList tableList = new TableInformationList();
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi == null) {
return tableList;
}
@@ -131,7 +131,7 @@ public class TablesResource {
regexp = ALPHA_NUM_REGEX_TABLE_ID) String tableIdStr) {
String rootTabletLocation = monitor.getContext().getRootTabletLocation();
TableId tableId = TableId.of(tableIdStr);
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
// fail fast if unable to get monitor info
if (mmi == null) {
return new TabletServers();
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
index 2a5ebd4..a6fa3b7 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
@@ -40,7 +40,7 @@ import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.dataImpl.KeyExtent;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.RecoveryStatus;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.rpc.ThriftUtil;
@@ -51,7 +51,7 @@ import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.AddressUtil;
import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.monitor.Monitor;
-import org.apache.accumulo.monitor.rest.manager.MasterResource;
+import org.apache.accumulo.monitor.rest.manager.ManagerResource;
import org.apache.accumulo.server.manager.state.DeadServerList;
import org.apache.accumulo.server.util.ActionStatsUpdator;
@@ -78,7 +78,7 @@ public class TabletServerResource {
*/
@GET
public TabletServers getTserverSummary() {
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi == null) {
return new TabletServers();
}
@@ -88,7 +88,7 @@ public class TabletServerResource {
tserverInfo.addTablet(new TabletServer(monitor, status));
}
- tserverInfo.addBadTabletServer(MasterResource.getTables(monitor));
+ tserverInfo.addBadTabletServer(ManagerResource.getTables(monitor));
return tserverInfo;
}
@@ -117,7 +117,7 @@ public class TabletServerResource {
public TabletServersRecovery getTserverRecovery() {
TabletServersRecovery recoveryList = new TabletServersRecovery();
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi == null) {
return new TabletServersRecovery();
}
@@ -150,7 +150,7 @@ public class TabletServerResource {
public TabletServerSummary getTserverDetails(
@PathParam("address") @NotNull @Pattern(regexp = HOSTNAME_PORT_REGEX) String tserverAddress)
throws Exception {
- MasterMonitorInfo mmi = monitor.getMmi();
+ ManagerMonitorInfo mmi = monitor.getMmi();
if (mmi == null)
return new TabletServerSummary();
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServers.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServers.java
index a64f58a..5d82776 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServers.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServers.java
@@ -21,7 +21,7 @@ package org.apache.accumulo.monitor.rest.tservers;
import java.util.ArrayList;
import java.util.List;
-import org.apache.accumulo.monitor.rest.manager.MasterInformation;
+import org.apache.accumulo.monitor.rest.manager.ManagerInformation;
/**
* Generates a list of servers, bad servers, and dead servers
@@ -47,7 +47,7 @@ public class TabletServers {
* @param info
* Master information to get bad and dead server information
*/
- public void addBadTabletServer(MasterInformation info) {
+ public void addBadTabletServer(ManagerInformation info) {
badServers = info.badTabletServers.badTabletServer;
deadServers = info.deadTabletServers.deadTabletServer;
}
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformationTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformationTest.java
index f10e1d3..ac8346f 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformationTest.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformationTest.java
@@ -96,7 +96,7 @@ public class TabletServerInformationTest {
assertEquals(5.67, tsi.queryMB, 0.001);
assertEquals(301, tsi.scans.intValue());
assertEquals(0.0, tsi.scansessions, 0.001); // can't test here; this comes from
- // MasterMonitorInfo
+ // ManagerMonitorInfo
assertEquals(tsi.scansessions, tsi.scanssessions, 0.001);
assertEquals(44, tsi.holdtime);
assertEquals("tServerTestName:1234", tsi.ip);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/AssignmentHandler.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/AssignmentHandler.java
index d785f68..cf753a9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/AssignmentHandler.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/AssignmentHandler.java
@@ -35,7 +35,7 @@ import org.apache.accumulo.server.manager.state.Assignment;
import org.apache.accumulo.server.manager.state.TabletStateStore;
import org.apache.accumulo.server.problems.ProblemReport;
import org.apache.accumulo.server.problems.ProblemReports;
-import org.apache.accumulo.server.util.MasterMetadataUtil;
+import org.apache.accumulo.server.util.ManagerMetadataUtil;
import org.apache.accumulo.tserver.TabletServerResourceManager.TabletResourceManager;
import org.apache.accumulo.tserver.mastermessage.TabletStatusMessage;
import org.apache.accumulo.tserver.tablet.Tablet;
@@ -107,7 +107,7 @@ class AssignmentHandler implements Runnable {
if (canLoad && tabletMetadata.sawOldPrevEndRow()) {
KeyExtent fixedExtent =
- MasterMetadataUtil.fixSplit(server.getContext(), tabletMetadata, server.getLock());
+ ManagerMetadataUtil.fixSplit(server.getContext(), tabletMetadata, server.getLock());
synchronized (server.openingTablets) {
server.openingTablets.remove(extent);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index e8c7200..87c8116 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -64,7 +64,7 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.master.thrift.BulkImportState;
import org.apache.accumulo.core.master.thrift.Compacting;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.metadata.MetadataTable;
@@ -134,7 +134,7 @@ import org.apache.accumulo.tserver.log.DfsLogger;
import org.apache.accumulo.tserver.log.LogSorter;
import org.apache.accumulo.tserver.log.MutationReceiver;
import org.apache.accumulo.tserver.log.TabletServerLogger;
-import org.apache.accumulo.tserver.mastermessage.MasterMessage;
+import org.apache.accumulo.tserver.mastermessage.ManagerMessage;
import org.apache.accumulo.tserver.mastermessage.SplitReportMessage;
import org.apache.accumulo.tserver.metrics.CompactionExecutorsMetrics;
import org.apache.accumulo.tserver.metrics.TabletServerMetrics;
@@ -206,7 +206,7 @@ public class TabletServer extends AbstractServer {
final TabletServerResourceManager resourceManager;
private final SecurityOperation security;
- private final BlockingDeque<MasterMessage> masterMessages = new LinkedBlockingDeque<>();
+ private final BlockingDeque<ManagerMessage> managerMessages = new LinkedBlockingDeque<>();
HostAndPort clientAddress;
@@ -512,8 +512,8 @@ public class TabletServer extends AbstractServer {
}
// add a message for the main thread to send back to the master
- public void enqueueMasterMessage(MasterMessage m) {
- masterMessages.addLast(m);
+ public void enqueueMasterMessage(ManagerMessage m) {
+ managerMessages.addLast(m);
}
void acquireRecoveryMemory(KeyExtent extent) {
@@ -555,20 +555,20 @@ public class TabletServer extends AbstractServer {
}
// Connect to the master for posting asynchronous results
- private MasterClientService.Client masterConnection(HostAndPort address) {
+ private ManagerClientService.Client masterConnection(HostAndPort address) {
try {
if (address == null) {
return null;
}
// log.info("Listener API to master has been opened");
- return ThriftUtil.getClient(new MasterClientService.Client.Factory(), address, getContext());
+ return ThriftUtil.getClient(new ManagerClientService.Client.Factory(), address, getContext());
} catch (Exception e) {
log.warn("Issue with masterConnection (" + address + ") " + e, e);
}
return null;
}
- private void returnMasterConnection(MasterClientService.Client client) {
+ private void returnMasterConnection(ManagerClientService.Client client) {
ThriftUtil.returnClient(client);
}
@@ -784,14 +784,14 @@ public class TabletServer extends AbstractServer {
while (!serverStopRequested) {
// send all of the pending messages
try {
- MasterMessage mm = null;
- MasterClientService.Client iface = null;
+ ManagerMessage mm = null;
+ ManagerClientService.Client iface = null;
try {
// wait until a message is ready to send, or a sever stop
// was requested
while (mm == null && !serverStopRequested) {
- mm = masterMessages.poll(1000, TimeUnit.MILLISECONDS);
+ mm = managerMessages.poll(1000, TimeUnit.MILLISECONDS);
}
// have a message to send to the master, so grab a
@@ -811,20 +811,20 @@ public class TabletServer extends AbstractServer {
mm = null;
} catch (TException ex) {
log.warn("Error sending message: queuing message again");
- masterMessages.putFirst(mm);
+ managerMessages.putFirst(mm);
mm = null;
throw ex;
}
// if any messages are immediately available grab em and
// send them
- mm = masterMessages.poll();
+ mm = managerMessages.poll();
}
} finally {
if (mm != null) {
- masterMessages.putFirst(mm);
+ managerMessages.putFirst(mm);
}
returnMasterConnection(iface);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/MasterMessage.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/ManagerMessage.java
similarity index 85%
rename from server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/MasterMessage.java
rename to server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/ManagerMessage.java
index ace74ab..59cc05a 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/MasterMessage.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/ManagerMessage.java
@@ -19,13 +19,13 @@
package org.apache.accumulo.tserver.mastermessage;
import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.thrift.TException;
-public interface MasterMessage {
+public interface ManagerMessage {
- void send(TCredentials info, String serverName, MasterClientService.Iface client)
+ void send(TCredentials info, String serverName, ManagerClientService.Iface client)
throws TException, ThriftSecurityException;
}
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
index 0dc90b9..7bca512 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
@@ -24,14 +24,14 @@ import java.util.stream.Collectors;
import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.dataImpl.KeyExtent;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
import org.apache.accumulo.core.master.thrift.TabletSplit;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.hadoop.io.Text;
import org.apache.thrift.TException;
-public class SplitReportMessage implements MasterMessage {
+public class SplitReportMessage implements ManagerMessage {
private Map<KeyExtent,Text> extents;
private KeyExtent old_extent;
@@ -44,7 +44,7 @@ public class SplitReportMessage implements MasterMessage {
}
@Override
- public void send(TCredentials credentials, String serverName, MasterClientService.Iface client)
+ public void send(TCredentials credentials, String serverName, ManagerClientService.Iface client)
throws TException, ThriftSecurityException {
TabletSplit split = new TabletSplit();
split.oldTablet = old_extent.toThrift();
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
index 3327590..40e8410 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
@@ -20,13 +20,13 @@ package org.apache.accumulo.tserver.mastermessage;
import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.dataImpl.KeyExtent;
-import org.apache.accumulo.core.master.thrift.MasterClientService.Iface;
+import org.apache.accumulo.core.master.thrift.ManagerClientService.Iface;
import org.apache.accumulo.core.master.thrift.TabletLoadState;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.thrift.TException;
-public class TabletStatusMessage implements MasterMessage {
+public class TabletStatusMessage implements ManagerMessage {
private KeyExtent extent;
private TabletLoadState status;
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
index a1de816..8a00228 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
@@ -46,7 +46,7 @@ import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.replication.StatusUtil;
-import org.apache.accumulo.server.util.MasterMetadataUtil;
+import org.apache.accumulo.server.util.ManagerMetadataUtil;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.util.ReplicationTableUtil;
import org.apache.hadoop.fs.Path;
@@ -450,7 +450,7 @@ class DatafileManager {
Set<StoredTabletFile> filesInUseByScans = waitForScansToFinish(oldDatafiles);
if (!filesInUseByScans.isEmpty())
log.debug("Adding scan refs to metadata {} {}", extent, filesInUseByScans);
- MasterMetadataUtil.replaceDatafiles(tablet.getContext(), extent, oldDatafiles,
+ ManagerMetadataUtil.replaceDatafiles(tablet.getContext(), extent, oldDatafiles,
filesInUseByScans, newFile, compactionId, dfv,
tablet.getTabletServer().getClientAddressString(), lastLocation,
tablet.getTabletServer().getLock());
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 1744240..8787f7f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -102,7 +102,7 @@ import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.accumulo.server.tablets.TabletTime;
import org.apache.accumulo.server.tablets.UniqueNameAllocator;
import org.apache.accumulo.server.util.FileUtil;
-import org.apache.accumulo.server.util.MasterMetadataUtil;
+import org.apache.accumulo.server.util.ManagerMetadataUtil;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.util.ReplicationTableUtil;
import org.apache.accumulo.tserver.ConditionCheckerContext.ConditionChecker;
@@ -1679,7 +1679,7 @@ public class Tablet {
MetadataTableUtil.splitTablet(high, extent.prevEndRow(), splitRatio,
getTabletServer().getContext(), getTabletServer().getLock());
- MasterMetadataUtil.addNewTablet(getTabletServer().getContext(), low, lowDirectoryName,
+ ManagerMetadataUtil.addNewTablet(getTabletServer().getContext(), low, lowDirectoryName,
getTabletServer().getTabletSession(), lowDatafileSizes, bulkImported, time, lastFlushID,
lastCompactID, getTabletServer().getLock());
MetadataTableUtil.finishSplit(high, highDatafileSizes, highDatafilesToRemove,
@@ -2127,7 +2127,7 @@ public class Tablet {
persistedTime = maxCommittedTime;
}
- return MasterMetadataUtil.updateTabletDataFile(getTabletServer().getContext(), extent,
+ return ManagerMetadataUtil.updateTabletDataFile(getTabletServer().getContext(), extent,
newDatafile, dfv, tabletTime.getMetadataTime(persistedTime),
tabletServer.getClientAddressString(), tabletServer.getLock(), unusedWalLogs,
lastLocation, flushId);
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/BulkImportListIterator.java b/shell/src/main/java/org/apache/accumulo/shell/commands/BulkImportListIterator.java
index c2284c5..298f7b3 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/BulkImportListIterator.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/BulkImportListIterator.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.accumulo.core.master.thrift.BulkImportStatus;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.util.Duration;
@@ -31,7 +31,7 @@ public class BulkImportListIterator implements Iterator<String> {
private final Iterator<String> iter;
- public BulkImportListIterator(List<String> tservers, MasterMonitorInfo stats) {
+ public BulkImportListIterator(List<String> tservers, ManagerMonitorInfo stats) {
List<String> result = new ArrayList<>();
for (BulkImportStatus status : stats.bulkImports) {
result.add(format(status));
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
index 6de23ad..4432bf5 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
@@ -26,10 +26,10 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.clientImpl.ClientContext;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.shell.Shell;
import org.apache.accumulo.shell.Shell.Command;
@@ -52,20 +52,20 @@ public class ListBulkCommand extends Command {
List<String> tservers;
- MasterMonitorInfo stats;
- MasterClientService.Iface client = null;
+ ManagerMonitorInfo stats;
+ ManagerClientService.Iface client = null;
ClientContext context = shellState.getContext();
while (true) {
try {
- client = MasterClient.getConnectionWithRetry(context);
- stats = client.getMasterStats(TraceUtil.traceInfo(), context.rpcCreds());
+ client = ManagerClient.getConnectionWithRetry(context);
+ stats = client.getManagerStats(TraceUtil.traceInfo(), context.rpcCreds());
break;
} catch (ThriftNotActiveServiceException e) {
// Let it loop, fetching a new location
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} finally {
if (client != null)
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java b/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java
index 6c88bb1..322a5ee 100644
--- a/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java
@@ -42,7 +42,7 @@ import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.file.FileOperations;
import org.apache.accumulo.core.file.FileSKVWriter;
import org.apache.accumulo.core.file.rfile.RFile;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
@@ -82,7 +82,7 @@ public class BulkImportMonitoringIT extends ConfigurableMacBase {
var ntc = new NewTableConfiguration().setProperties(props).withSplits(splits);
c.tableOperations().create(tableName, ntc);
- MasterMonitorInfo stats = getCluster().getMasterMonitorInfo();
+ ManagerMonitorInfo stats = getCluster().getMasterMonitorInfo();
assertEquals(1, stats.tServerInfo.size());
assertEquals(0, stats.bulkImports.size());
assertEquals(0, stats.tServerInfo.get(0).bulkImports.size());
diff --git a/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java b/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java
index c7163ba..5818f09 100644
--- a/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java
@@ -44,7 +44,7 @@ import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.file.FileOperations;
import org.apache.accumulo.core.file.FileSKVWriter;
import org.apache.accumulo.core.file.rfile.RFile;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
import org.apache.accumulo.test.functional.ConfigurableMacBase;
@@ -113,7 +113,7 @@ public class CountNameNodeOpsBulkIT extends ConfigurableMacBase {
var ntc = new NewTableConfiguration().setProperties(props).withSplits(splits);
c.tableOperations().create(tableName, ntc);
- MasterMonitorInfo stats = getCluster().getMasterMonitorInfo();
+ ManagerMonitorInfo stats = getCluster().getMasterMonitorInfo();
assertEquals(1, stats.tServerInfo.size());
log.info("Creating lots of bulk import files");
diff --git a/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java b/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java
index 2ed73cd..3642d3e 100644
--- a/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java
@@ -27,12 +27,12 @@ import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.clientImpl.ClientContext;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.master.thrift.MasterClientService.Client;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerClientService.Client;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.trace.TraceUtil;
@@ -58,7 +58,7 @@ public class DetectDeadTabletServersIT extends ConfigurableMacBase {
log.info("verifying that everything is up");
Iterators.size(c.createScanner(MetadataTable.NAME, Authorizations.EMPTY).iterator());
- MasterMonitorInfo stats = getStats(c);
+ ManagerMonitorInfo stats = getStats(c);
assertEquals(2, stats.tServerInfo.size());
assertEquals(0, stats.badTServers.size());
assertEquals(0, stats.deadTabletServers.size());
@@ -88,20 +88,20 @@ public class DetectDeadTabletServersIT extends ConfigurableMacBase {
}
}
- private MasterMonitorInfo getStats(AccumuloClient c) throws Exception {
+ private ManagerMonitorInfo getStats(AccumuloClient c) throws Exception {
ClientContext context = (ClientContext) c;
Client client = null;
while (true) {
try {
- client = MasterClient.getConnectionWithRetry(context);
+ client = ManagerClient.getConnectionWithRetry(context);
log.info("Fetching master stats");
- return client.getMasterStats(TraceUtil.traceInfo(), context.rpcCreds());
+ return client.getManagerStats(TraceUtil.traceInfo(), context.rpcCreds());
} catch (ThriftNotActiveServiceException e) {
// Let it loop, fetching a new location
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} finally {
if (client != null) {
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java b/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java
similarity index 92%
rename from test/src/main/java/org/apache/accumulo/test/GetMasterStats.java
rename to test/src/main/java/org/apache/accumulo/test/GetManagerStats.java
index 0730c50..6363888 100644
--- a/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java
+++ b/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java
@@ -25,13 +25,13 @@ import java.util.Date;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException;
import org.apache.accumulo.core.conf.SiteConfiguration;
import org.apache.accumulo.core.master.thrift.BulkImportStatus;
import org.apache.accumulo.core.master.thrift.DeadServer;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.RecoveryStatus;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
@@ -39,22 +39,22 @@ import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.util.TableInfoUtil;
-public class GetMasterStats {
+public class GetManagerStats {
public static void main(String[] args) throws Exception {
- MasterClientService.Iface client = null;
- MasterMonitorInfo stats = null;
+ ManagerClientService.Iface client = null;
+ ManagerMonitorInfo stats = null;
var context = new ServerContext(SiteConfiguration.auto());
while (true) {
try {
- client = MasterClient.getConnectionWithRetry(context);
- stats = client.getMasterStats(TraceUtil.traceInfo(), context.rpcCreds());
+ client = ManagerClient.getConnectionWithRetry(context);
+ stats = client.getManagerStats(TraceUtil.traceInfo(), context.rpcCreds());
break;
} catch (ThriftNotActiveServiceException e) {
// Let it loop, fetching a new location
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} finally {
if (client != null) {
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java b/test/src/main/java/org/apache/accumulo/test/ManagerRepairsDualAssignmentIT.java
similarity index 98%
rename from test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
rename to test/src/main/java/org/apache/accumulo/test/ManagerRepairsDualAssignmentIT.java
index b0a6354..1909a0f 100644
--- a/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ManagerRepairsDualAssignmentIT.java
@@ -55,7 +55,7 @@ import org.junit.Test;
import com.google.common.collect.Iterators;
-public class MasterRepairsDualAssignmentIT extends ConfigurableMacBase {
+public class ManagerRepairsDualAssignmentIT extends ConfigurableMacBase {
@Override
public int defaultTimeoutSeconds() {
diff --git a/test/src/main/java/org/apache/accumulo/test/ThriftServerBindsBeforeZooKeeperLockIT.java b/test/src/main/java/org/apache/accumulo/test/ThriftServerBindsBeforeZooKeeperLockIT.java
index 667e612..29e93a2 100644
--- a/test/src/main/java/org/apache/accumulo/test/ThriftServerBindsBeforeZooKeeperLockIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ThriftServerBindsBeforeZooKeeperLockIT.java
@@ -34,7 +34,7 @@ import org.apache.accumulo.core.util.MonitorUtil;
import org.apache.accumulo.fate.zookeeper.ZooReader;
import org.apache.accumulo.gc.SimpleGarbageCollector;
import org.apache.accumulo.harness.AccumuloClusterHarness;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl;
import org.apache.accumulo.miniclusterImpl.ProcessReference;
@@ -259,7 +259,7 @@ public class ThriftServerBindsBeforeZooKeeperLockIT extends AccumuloClusterHarne
break;
case MANAGER:
property = Property.MANAGER_CLIENTPORT;
- service = Master.class;
+ service = Manager.class;
break;
case GARBAGE_COLLECTOR:
property = Property.GC_PORT;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BackupMasterIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BackupManagerIT.java
similarity index 94%
rename from test/src/main/java/org/apache/accumulo/test/functional/BackupMasterIT.java
rename to test/src/main/java/org/apache/accumulo/test/functional/BackupManagerIT.java
index 17315fb..6e7da59 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BackupMasterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BackupManagerIT.java
@@ -27,10 +27,10 @@ import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.fate.util.UtilWaitThread;
import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.junit.Test;
-public class BackupMasterIT extends ConfigurableMacBase {
+public class BackupManagerIT extends ConfigurableMacBase {
@Override
protected int defaultTimeoutSeconds() {
@@ -42,7 +42,7 @@ public class BackupMasterIT extends ConfigurableMacBase {
// wait for master
UtilWaitThread.sleep(1000);
// create a backup
- Process backup = exec(Master.class);
+ Process backup = exec(Manager.class);
try (AccumuloClient client = Accumulo.newClient().from(getClientProperties()).build()) {
String secret = getCluster().getSiteConfiguration().get(Property.INSTANCE_SECRET);
ZooReaderWriter writer = new ZooReaderWriter(cluster.getZooKeepers(), 30 * 1000, secret);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
index 4586a8b..d63af7c 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
@@ -33,11 +33,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.clientImpl.ClientContext;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.security.Authorizations;
@@ -107,14 +107,14 @@ public class BalanceAfterCommsFailureIT extends ConfigurableMacBase {
private void checkBalance(AccumuloClient c) throws Exception {
ClientContext context = (ClientContext) c;
- MasterMonitorInfo stats = null;
+ ManagerMonitorInfo stats = null;
int unassignedTablets = 1;
for (int i = 0; unassignedTablets > 0 && i < 10; i++) {
- MasterClientService.Iface client = null;
+ ManagerClientService.Iface client = null;
while (true) {
try {
- client = MasterClient.getConnectionWithRetry(context);
- stats = client.getMasterStats(TraceUtil.traceInfo(), context.rpcCreds());
+ client = ManagerClient.getConnectionWithRetry(context);
+ stats = client.getManagerStats(TraceUtil.traceInfo(), context.rpcCreds());
break;
} catch (ThriftNotActiveServiceException e) {
// Let it loop, fetching a new location
@@ -122,7 +122,7 @@ public class BalanceAfterCommsFailureIT extends ConfigurableMacBase {
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} finally {
if (client != null)
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
unassignedTablets = stats.getUnassignedTablets();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
index 7c8f8e1..d9a32f4 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
@@ -35,12 +35,12 @@ import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.clientImpl.Credentials;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException;
import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.fate.util.UtilWaitThread;
@@ -155,12 +155,12 @@ public class BalanceInPresenceOfOfflineTableIT extends AccumuloClusterHarness {
log.debug("fetch the list of tablets assigned to each tserver.");
- MasterClientService.Iface client = null;
- MasterMonitorInfo stats;
+ ManagerClientService.Iface client = null;
+ ManagerMonitorInfo stats;
while (true) {
try {
- client = MasterClient.getConnectionWithRetry((ClientContext) accumuloClient);
- stats = client.getMasterStats(TraceUtil.traceInfo(),
+ client = ManagerClient.getConnectionWithRetry((ClientContext) accumuloClient);
+ stats = client.getManagerStats(TraceUtil.traceInfo(),
creds.toThrift(accumuloClient.instanceOperations().getInstanceID()));
break;
} catch (ThriftSecurityException exception) {
@@ -173,7 +173,7 @@ public class BalanceInPresenceOfOfflineTableIT extends AccumuloClusterHarness {
throw new AccumuloException(exception);
} finally {
if (client != null) {
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ManagerApiIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManagerApiIT.java
index d968584..c0f7b13 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ManagerApiIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerApiIT.java
@@ -34,10 +34,10 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.clientImpl.ClientExec;
import org.apache.accumulo.core.clientImpl.Credentials;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
-import org.apache.accumulo.core.master.thrift.MasterGoalState;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
+import org.apache.accumulo.core.master.thrift.ManagerGoalState;
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
@@ -87,12 +87,12 @@ public class ManagerApiIT extends SharedMiniClusterBase {
SharedMiniClusterBase.stopMiniCluster();
}
- private Function<TCredentials,ClientExec<MasterClientService.Client>> op;
+ private Function<TCredentials,ClientExec<ManagerClientService.Client>> op;
@Test
public void testPermissions_setMasterGoalState() throws Exception {
// To setMasterGoalState, user needs SystemPermission.SYSTEM
- op = user -> client -> client.setMasterGoalState(null, user, MasterGoalState.NORMAL);
+ op = user -> client -> client.setManagerGoalState(null, user, ManagerGoalState.NORMAL);
expectPermissionDenied(op, regularUser);
expectPermissionSuccess(op, rootUser);
expectPermissionSuccess(op, privilegedUser);
@@ -219,17 +219,17 @@ public class ManagerApiIT extends SharedMiniClusterBase {
}
private static void expectPermissionSuccess(
- Function<TCredentials,ClientExec<MasterClientService.Client>> op, Credentials user)
+ Function<TCredentials,ClientExec<ManagerClientService.Client>> op, Credentials user)
throws Exception {
try (AccumuloClient client = Accumulo.newClient().from(getClientProps())
.as(user.getPrincipal(), user.getToken()).build()) {
ClientContext context = (ClientContext) client;
- MasterClient.executeVoid(context, op.apply(context.rpcCreds()));
+ ManagerClient.executeVoid(context, op.apply(context.rpcCreds()));
}
}
private static void expectPermissionDenied(
- Function<TCredentials,ClientExec<MasterClientService.Client>> op, Credentials user)
+ Function<TCredentials,ClientExec<ManagerClientService.Client>> op, Credentials user)
throws Exception {
AccumuloSecurityException e =
assertThrows(AccumuloSecurityException.class, () -> expectPermissionSuccess(op, user));
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java
similarity index 98%
rename from test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
rename to test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java
index 99c71b0..e676391 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java
@@ -37,7 +37,7 @@ import org.apache.accumulo.harness.AccumuloClusterHarness;
import org.apache.accumulo.server.manager.state.MetaDataTableScanner;
import org.junit.Test;
-public class MasterAssignmentIT extends AccumuloClusterHarness {
+public class ManagerAssignmentIT extends AccumuloClusterHarness {
@Override
protected int defaultTimeoutSeconds() {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java
similarity index 97%
rename from test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
rename to test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java
index a39a97a..04f0129 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java
@@ -34,7 +34,7 @@ import org.apache.accumulo.test.VerifyIngest.VerifyParams;
import org.apache.hadoop.conf.Configuration;
import org.junit.Test;
-public class MasterFailoverIT extends AccumuloClusterHarness {
+public class ManagerFailoverIT extends AccumuloClusterHarness {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MasterMetricsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManagerMetricsIT.java
similarity index 98%
rename from test/src/main/java/org/apache/accumulo/test/functional/MasterMetricsIT.java
rename to test/src/main/java/org/apache/accumulo/test/functional/ManagerMetricsIT.java
index a6e05b6..085e775 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MasterMetricsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerMetricsIT.java
@@ -50,14 +50,14 @@ import org.slf4j.LoggerFactory;
* Functional test that uses a hadoop metrics 2 file sink to read published metrics for
* verification.
*/
-public class MasterMetricsIT extends AccumuloClusterHarness {
+public class ManagerMetricsIT extends AccumuloClusterHarness {
@Override
public boolean canRunTest(ClusterType type) {
return type == ClusterType.MINI;
}
- private static final Logger log = LoggerFactory.getLogger(MasterMetricsIT.class);
+ private static final Logger log = LoggerFactory.getLogger(ManagerMetricsIT.class);
private AccumuloClient accumuloClient;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
index 1da807c..027adc5 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
@@ -29,11 +29,11 @@ import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.admin.NewTableConfiguration;
import org.apache.accumulo.core.clientImpl.ClientContext;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.master.thrift.MasterClientService.Client;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerClientService.Client;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.metadata.MetadataTable;
@@ -82,20 +82,20 @@ public class MetadataMaxFilesIT extends ConfigurableMacBase {
}
while (true) {
- MasterMonitorInfo stats;
+ ManagerMonitorInfo stats;
Client client = null;
try {
ClientContext context = (ClientContext) c;
- client = MasterClient.getConnectionWithRetry(context);
+ client = ManagerClient.getConnectionWithRetry(context);
log.info("Fetching stats");
- stats = client.getMasterStats(TraceUtil.traceInfo(), context.rpcCreds());
+ stats = client.getManagerStats(TraceUtil.traceInfo(), context.rpcCreds());
} catch (ThriftNotActiveServiceException e) {
// Let it loop, fetching a new location
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
continue;
} finally {
if (client != null)
- MasterClient.close(client);
+ ManagerClient.close(client);
}
int tablets = 0;
for (TabletServerStatus tserver : stats.tServerInfo) {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
index becbe9b..86f0eac 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
@@ -32,11 +32,11 @@ import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.clientImpl.Credentials;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
-import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.ManagerClientService;
+import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.trace.TraceUtil;
@@ -82,14 +82,14 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacBase {
sleepUninterruptibly(45, TimeUnit.SECONDS);
Credentials creds = new Credentials("root", new PasswordToken(ROOT_PASSWORD));
- MasterMonitorInfo stats = null;
+ ManagerMonitorInfo stats = null;
int unassignedTablets = 1;
for (int i = 0; unassignedTablets > 0 && i < 20; i++) {
- MasterClientService.Iface client = null;
+ ManagerClientService.Iface client = null;
while (true) {
try {
- client = MasterClient.getConnectionWithRetry((ClientContext) c);
- stats = client.getMasterStats(TraceUtil.traceInfo(),
+ client = ManagerClient.getConnectionWithRetry((ClientContext) c);
+ stats = client.getManagerStats(TraceUtil.traceInfo(),
creds.toThrift(c.instanceOperations().getInstanceID()));
break;
} catch (ThriftNotActiveServiceException e) {
@@ -97,7 +97,7 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacBase {
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} finally {
if (client != null)
- MasterClient.close(client);
+ ManagerClient.close(client);
}
}
unassignedTablets = stats.getUnassignedTablets();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
index 05dd85f..5d7e48a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
@@ -70,7 +70,7 @@ import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.manager.state.Assignment;
-import org.apache.accumulo.server.util.MasterMetadataUtil;
+import org.apache.accumulo.server.util.ManagerMetadataUtil;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.zookeeper.TransactionWatcher;
import org.apache.hadoop.fs.Path;
@@ -216,15 +216,15 @@ public class SplitRecoveryIT extends ConfigurableMacBase {
if (steps >= 1) {
Map<Long,List<TabletFile>> bulkFiles = getBulkFilesLoaded(context, extent);
- MasterMetadataUtil.addNewTablet(context, low, "lowDir", instance, lowDatafileSizes, bulkFiles,
- new MetadataTime(0, TimeType.LOGICAL), -1L, -1L, zl);
+ ManagerMetadataUtil.addNewTablet(context, low, "lowDir", instance, lowDatafileSizes,
+ bulkFiles, new MetadataTime(0, TimeType.LOGICAL), -1L, -1L, zl);
}
if (steps >= 2) {
MetadataTableUtil.finishSplit(high, highDatafileSizes, highDatafilesToRemove, context, zl);
}
TabletMetadata meta = context.getAmple().readTablet(high);
- KeyExtent fixedExtent = MasterMetadataUtil.fixSplit(context, meta, zl);
+ KeyExtent fixedExtent = ManagerMetadataUtil.fixSplit(context, meta, zl);
if (steps < 2)
assertEquals(splitRatio, meta.getSplitRatio(), 0.0);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
index c1035ea..7e68534 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
@@ -52,7 +52,7 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.manager.state.tables.TableState;
-import org.apache.accumulo.core.master.thrift.MasterState;
+import org.apache.accumulo.core.master.thrift.ManagerState;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.TServerInstance;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.CurrentLocationColumnFamily;
@@ -312,8 +312,8 @@ public class TabletStateChangeIteratorIT extends AccumuloClusterHarness {
}
@Override
- public MasterState getMasterState() {
- return MasterState.NORMAL;
+ public ManagerState getMasterState() {
+ return ManagerState.NORMAL;
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java b/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
index b40306d..2d15f57 100644
--- a/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
@@ -36,7 +36,7 @@ import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.dataImpl.KeyExtent;
-import org.apache.accumulo.core.master.thrift.MasterState;
+import org.apache.accumulo.core.master.thrift.ManagerState;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.TServerInstance;
import org.apache.accumulo.core.metadata.TabletLocationState;
@@ -91,8 +91,8 @@ public class MergeStateIT extends ConfigurableMacBase {
}
@Override
- public MasterState getMasterState() {
- return MasterState.NORMAL;
+ public ManagerState getMasterState() {
+ return ManagerState.NORMAL;
}
@Override
diff --git a/test/src/main/java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java b/test/src/main/java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java
index 1248324..c4b523a 100644
--- a/test/src/main/java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java
@@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.clientImpl.ClientContext;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Range;
@@ -126,8 +126,8 @@ public class SuspendedTabletsIT extends ConfigurableMacBase {
for (int i1 = 0; i1 < count; ++i1) {
final String tserverName = tserversList.get(i1).getHostPortSession();
- MasterClient.executeVoid(ctx, client -> {
- log.info("Sending shutdown command to {} via MasterClientService", tserverName);
+ ManagerClient.executeVoid(ctx, client -> {
+ log.info("Sending shutdown command to {} via ManagerClientService", tserverName);
client.shutdownTabletServer(null, ctx.rpcCreds(), tserverName, false);
});
}
diff --git a/test/src/main/java/org/apache/accumulo/test/metrics/fate/FateMetricsTest.java b/test/src/main/java/org/apache/accumulo/test/metrics/fate/FateMetricsTest.java
index e86439d..054c8af 100644
--- a/test/src/main/java/org/apache/accumulo/test/metrics/fate/FateMetricsTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/metrics/fate/FateMetricsTest.java
@@ -30,9 +30,9 @@ import org.apache.accumulo.fate.ReadOnlyTStore;
import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.fate.ZooStore;
import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.manager.Master;
+import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.manager.metrics.fate.FateMetrics;
-import org.apache.accumulo.manager.tableOps.MasterRepo;
+import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.test.zookeeper.ZooKeeperTestingServer;
import org.apache.zookeeper.ZooKeeper;
@@ -59,10 +59,10 @@ public class FateMetricsTest {
private static final Logger log = LoggerFactory.getLogger(FateMetricsTest.class);
private static ZooKeeperTestingServer szk = null;
private static ZooReaderWriter zooReaderWriter;
- private ZooStore<Master> zooStore = null;
+ private ZooStore<Manager> zooStore = null;
private ZooKeeper zookeeper = null;
private ServerContext context = null;
- private Master master;
+ private Manager master;
@BeforeClass
public static void setupZk() {
@@ -94,7 +94,7 @@ public class FateMetricsTest {
zooStore = new ZooStore<>(MOCK_ZK_ROOT + Constants.ZFATE, zooReaderWriter);
- master = EasyMock.createMock(Master.class);
+ master = EasyMock.createMock(Manager.class);
context = EasyMock.createMock(ServerContext.class);
EasyMock.expect(context.getZooReaderWriter()).andReturn(zooReaderWriter).anyTimes();
@@ -215,10 +215,10 @@ public class FateMetricsTest {
zooStore.setStatus(txId, ReadOnlyTStore.TStatus.IN_PROGRESS);
- Repo<Master> repo = new FakeOp();
+ Repo<Manager> repo = new FakeOp();
zooStore.push(txId, repo);
- Repo<Master> step = new FakeOpStep1();
+ Repo<Manager> step = new FakeOpStep1();
zooStore.push(txId, step);
zooStore.setProperty(txId, "debug", repo.getDescription());
@@ -290,20 +290,20 @@ public class FateMetricsTest {
}
}
- private static class FakeOp extends MasterRepo {
+ private static class FakeOp extends ManagerRepo {
private static final long serialVersionUID = -1L;
@Override
- public Repo<Master> call(long tid, Master environment) {
+ public Repo<Manager> call(long tid, Manager environment) {
return null;
}
}
- private static class FakeOpStep1 extends MasterRepo {
+ private static class FakeOpStep1 extends ManagerRepo {
private static final long serialVersionUID = -1L;
@Override
- public Repo<Master> call(long tid, Master environment) {
+ public Repo<Manager> call(long tid, Manager environment) {
return null;
}
}
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 bf8a390..92a94e0 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
@@ -37,7 +37,7 @@ import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.clientImpl.ClientContext;
-import org.apache.accumulo.core.clientImpl.MasterClient;
+import org.apache.accumulo.core.clientImpl.ManagerClient;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
@@ -386,7 +386,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB
// Get the tservers which the master deems as active
final ClientContext context = (ClientContext) client;
- List<String> tservers = MasterClient.execute(context,
+ List<String> tservers = ManagerClient.execute(context,
cli -> cli.getActiveTservers(TraceUtil.traceInfo(), context.rpcCreds()));
assertEquals("Expected only one active tservers", 1, tservers.size());
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 6a388be..202d3db 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
@@ -48,8 +48,8 @@ import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.accumulo.core.trace.thrift.TInfo;
-import org.apache.accumulo.manager.Master;
-import org.apache.accumulo.manager.MasterClientServiceHandler;
+import org.apache.accumulo.manager.Manager;
+import org.apache.accumulo.manager.ManagerClientServiceHandler;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.accumulo.test.functional.ConfigurableMacBase;
@@ -86,11 +86,11 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
* Spoof out the Master so we can call the implementation without starting a full instance.
*/
private ReplicationOperationsImpl getReplicationOperations() {
- Master master = EasyMock.createMock(Master.class);
+ Manager master = EasyMock.createMock(Manager.class);
EasyMock.expect(master.getContext()).andReturn(serverContext).anyTimes();
EasyMock.replay(master);
- final MasterClientServiceHandler mcsh = new MasterClientServiceHandler(master) {
+ final ManagerClientServiceHandler mcsh = new ManagerClientServiceHandler(master) {
@Override
protected TableId getTableId(ClientContext context, String tableName) {
try {
diff --git a/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java b/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
index cfa7295..a0a1a98 100644
--- a/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
@@ -41,8 +41,8 @@ import org.apache.accumulo.core.util.Version;
import org.apache.accumulo.gc.GCExecutable;
import org.apache.accumulo.gc.SimpleGarbageCollector;
import org.apache.accumulo.manager.ManagerExecutable;
-import org.apache.accumulo.manager.Master;
import org.apache.accumulo.manager.MasterExecutable;
+import org.apache.accumulo.master.Master;
import org.apache.accumulo.minicluster.MiniAccumuloRunner;
import org.apache.accumulo.miniclusterImpl.MiniClusterExecutable;
import org.apache.accumulo.monitor.Monitor;
@@ -99,6 +99,7 @@ public class KeywordStartIT {
// Note: this test may fail in Eclipse, if the services files haven't been generated by the
// AutoService annotation processor
@Test
+ @SuppressWarnings("deprecation")
public void testExpectedClasses() {
assumeTrue(new File(System.getProperty("user.dir") + "/src").exists());
TreeMap<String,Class<? extends KeywordExecutable>> expectSet = new TreeMap<>();
@@ -152,6 +153,7 @@ public class KeywordStartIT {
}
@Test
+ @SuppressWarnings("deprecation")
public void checkHasMain() {
assertFalse("Sanity check for test failed. Somehow the test class has a main method",
hasMain(this.getClass()));
diff --git a/test/src/main/resources/log4j2-test.properties b/test/src/main/resources/log4j2-test.properties
index 428bcf5..5343437 100644
--- a/test/src/main/resources/log4j2-test.properties
+++ b/test/src/main/resources/log4j2-test.properties
@@ -30,7 +30,7 @@ appender.console.layout.pattern = %d{ISO8601} [%c{2}] %-5p: %m%n
logger.01.name = org.apache.accumulo.core
logger.01.level = debug
-logger.02.name = org.apache.accumulo.core.clientImpl.MasterClient
+logger.02.name = org.apache.accumulo.core.clientImpl.ManagerClient
logger.02.level = info
logger.03.name = org.apache.accumulo.core.clientImpl.ServerClient