This is an automated email from the ASF dual-hosted git repository.
ctubbsii 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 240c60c Resolve deprecation warnings in imports
240c60c is described below
commit 240c60c7c8ec326338d15ecb3c1168cee7a54557
Author: Christopher Tubbs <[email protected]>
AuthorDate: Thu Nov 18 13:03:16 2021 -0500
Resolve deprecation warnings in imports
Use fully-qualified class names to avoid deprecation warnings in import
statements
---
.../accumulo/core/client/AccumuloClient.java | 3 +-
.../accumulo/core/clientImpl/ClientContext.java | 6 ++--
.../accumulo/core/util/threads/ThreadPools.java | 1 +
.../org/apache/accumulo/core/data/TableIdTest.java | 3 +-
.../core/metadata/MetadataServicerTest.java | 7 +++--
.../apache/accumulo/core/util/ValidatorsTest.java | 7 +++--
.../org/apache/accumulo/server/fs/VolumeUtil.java | 3 +-
.../apache/accumulo/server/init/Initialize.java | 32 +++++++++++-----------
.../server/security/SecurityOperation.java | 3 +-
.../accumulo/server/util/ReplicationTableUtil.java | 7 ++---
.../accumulo/gc/GarbageCollectWriteAheadLogs.java | 9 ++----
.../accumulo/gc/GarbageCollectionAlgorithm.java | 4 +--
.../apache/accumulo/gc/SimpleGarbageCollector.java | 13 ++++-----
.../gc/GarbageCollectWriteAheadLogsTest.java | 4 +--
.../apache/accumulo/gc/GarbageCollectionTest.java | 4 +--
.../java/org/apache/accumulo/manager/Manager.java | 14 ++++------
.../manager/ManagerClientServiceHandler.java | 17 ++++++------
.../org/apache/accumulo/tserver/TabletServer.java | 21 ++++++--------
.../accumulo/tserver/log/TabletServerLogger.java | 10 +++----
.../accumulo/tserver/tablet/DatafileManager.java | 8 ++----
.../org/apache/accumulo/tserver/tablet/Tablet.java | 13 ++++-----
.../test/ManagerRepairsDualAssignmentIT.java | 3 +-
22 files changed, 88 insertions(+), 104 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/AccumuloClient.java
b/core/src/main/java/org/apache/accumulo/core/client/AccumuloClient.java
index 1cf9d18..a0b543c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/AccumuloClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/AccumuloClient.java
@@ -24,7 +24,6 @@ import java.util.Properties;
import org.apache.accumulo.core.client.admin.InstanceOperations;
import org.apache.accumulo.core.client.admin.NamespaceOperations;
-import org.apache.accumulo.core.client.admin.ReplicationOperations;
import org.apache.accumulo.core.client.admin.SecurityOperations;
import org.apache.accumulo.core.client.admin.TableOperations;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
@@ -324,7 +323,7 @@ public interface AccumuloClient extends AutoCloseable {
* @return an object to modify replication configuration
*/
@Deprecated(since = "2.1.0")
- ReplicationOperations replicationOperations();
+ org.apache.accumulo.core.client.admin.ReplicationOperations
replicationOperations();
/**
* @return All {@link Properties} used to create client except 'auth.token'
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index 99f2413..247b45e 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -52,7 +52,6 @@ import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.TableOfflineException;
import org.apache.accumulo.core.client.admin.InstanceOperations;
import org.apache.accumulo.core.client.admin.NamespaceOperations;
-import org.apache.accumulo.core.client.admin.ReplicationOperations;
import org.apache.accumulo.core.client.admin.SecurityOperations;
import org.apache.accumulo.core.client.admin.TableOperations;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
@@ -122,7 +121,7 @@ public class ClientContext implements AccumuloClient {
private NamespaceOperations namespaceops = null;
private InstanceOperations instanceops = null;
@SuppressWarnings("deprecation")
- private ReplicationOperations replicationops = null;
+ private org.apache.accumulo.core.client.admin.ReplicationOperations
replicationops = null;
private final SingletonReservation singletonReservation;
private void ensureOpen() {
@@ -685,7 +684,8 @@ public class ClientContext implements AccumuloClient {
@Override
@Deprecated
- public synchronized ReplicationOperations replicationOperations() {
+ public synchronized
org.apache.accumulo.core.client.admin.ReplicationOperations
+ replicationOperations() {
ensureOpen();
if (replicationops == null) {
replicationops = new ReplicationOperationsImpl(this);
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java
b/core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java
index db58204..25c3c7c 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java
@@ -102,6 +102,7 @@ public class ThreadPools {
* @throws RuntimeException
* if property is not handled
*/
+ @SuppressWarnings("deprecation")
public static ExecutorService createExecutorService(final
AccumuloConfiguration conf,
final Property p) {
diff --git a/core/src/test/java/org/apache/accumulo/core/data/TableIdTest.java
b/core/src/test/java/org/apache/accumulo/core/data/TableIdTest.java
index 8ff40c8..2102e32 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/TableIdTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/TableIdTest.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.fail;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
-import org.apache.accumulo.core.replication.ReplicationTable;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
@@ -55,7 +54,7 @@ public class TableIdTest {
public void testCacheNoDuplicates() {
@SuppressWarnings("deprecation")
- TableId REPL_TABLE_ID = ReplicationTable.ID;
+ TableId REPL_TABLE_ID =
org.apache.accumulo.core.replication.ReplicationTable.ID;
// the next two lines just preloads the built-ins, since they now exist in
a separate class from
// TableId, and aren't preloaded when the TableId class is referenced
diff --git
a/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java
b/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java
index d30d045..889d836 100644
---
a/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/metadata/MetadataServicerTest.java
@@ -30,7 +30,6 @@ import
org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.admin.TableOperations;
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.data.TableId;
-import org.apache.accumulo.core.replication.ReplicationTable;
import org.easymock.EasyMock;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -42,9 +41,11 @@ public class MetadataServicerTest {
private static ClientContext context;
@SuppressWarnings("deprecation")
- private static final TableId REPL_TABLE_ID = ReplicationTable.ID;
+ private static final TableId REPL_TABLE_ID =
+ org.apache.accumulo.core.replication.ReplicationTable.ID;
@SuppressWarnings("deprecation")
- private static final String REPL_TABLE_NAME = ReplicationTable.NAME;
+ private static final String REPL_TABLE_NAME =
+ org.apache.accumulo.core.replication.ReplicationTable.NAME;
@BeforeClass
public static void setupContext() {
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/ValidatorsTest.java
b/core/src/test/java/org/apache/accumulo/core/util/ValidatorsTest.java
index 6a18c4e..2a60862 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/ValidatorsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/ValidatorsTest.java
@@ -30,16 +30,17 @@ import org.apache.accumulo.core.clientImpl.Namespace;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
-import org.apache.accumulo.core.replication.ReplicationTable;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
public class ValidatorsTest {
@SuppressWarnings("deprecation")
- private static final TableId REPL_TABLE_ID = ReplicationTable.ID;
+ private static final TableId REPL_TABLE_ID =
+ org.apache.accumulo.core.replication.ReplicationTable.ID;
@SuppressWarnings("deprecation")
- private static final String REPL_TABLE_NAME = ReplicationTable.NAME;
+ private static final String REPL_TABLE_NAME =
+ org.apache.accumulo.core.replication.ReplicationTable.NAME;
private static <T> void checkNull(Consumer<T> nullConsumer) {
var e = assertThrows(IllegalArgumentException.class, () ->
nullConsumer.accept(null));
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
index 313d305..a999d5a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
@@ -34,7 +34,6 @@ import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.fate.zookeeper.ServiceLock;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.fs.VolumeManager.FileType;
-import org.apache.accumulo.server.replication.StatusUtil;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.util.ReplicationTableUtil;
@@ -181,7 +180,7 @@ public class VolumeUtil {
filesToAdd, zooLock, context);
if (replicate) {
@SuppressWarnings("deprecation")
- Status status = StatusUtil.fileClosed();
+ Status status =
org.apache.accumulo.server.replication.StatusUtil.fileClosed();
log.debug("Tablet directory switched, need to record old log files {}
{}", logsToRemove,
ProtobufUtil.toString(status));
// Before deleting these logs, we need to mark them for replication
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 91eb7b6..95873ce 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
@@ -73,10 +73,6 @@ 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.metadata.schema.MetadataTime;
import org.apache.accumulo.core.metadata.schema.RootTabletMetadata;
-import org.apache.accumulo.core.replication.ReplicationConstants;
-import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
-import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection;
-import org.apache.accumulo.core.replication.ReplicationTable;
import org.apache.accumulo.core.singletons.SingletonManager;
import org.apache.accumulo.core.singletons.SingletonManager.Mode;
import org.apache.accumulo.core.spi.compaction.SimpleCompactionDispatcher;
@@ -100,8 +96,6 @@ import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.accumulo.server.iterators.MetadataBulkLoadFilter;
import org.apache.accumulo.server.log.WalStateManager;
import org.apache.accumulo.server.metadata.RootGcCandidates;
-import org.apache.accumulo.server.replication.ReplicationUtil;
-import org.apache.accumulo.server.replication.StatusCombiner;
import org.apache.accumulo.server.security.AuditedSecurityOperation;
import org.apache.accumulo.server.security.SecurityUtil;
import org.apache.accumulo.server.tables.TableManager;
@@ -140,7 +134,8 @@ public class Initialize implements KeywordExecutable {
private static final String DEFAULT_ROOT_USER = "root";
private static final String TABLE_TABLETS_TABLET_DIR = "table_info";
@SuppressWarnings("deprecation")
- private static final TableId REPLICATION_TABLE = ReplicationTable.ID;
+ private static final TableId REPLICATION_TABLE =
+ org.apache.accumulo.core.replication.ReplicationTable.ID;
private static ZooReaderWriter zoo = null;
@@ -217,7 +212,7 @@ public class Initialize implements KeywordExecutable {
// Combiner
// configured
@SuppressWarnings("deprecation")
- Class<StatusCombiner> statusCombinerClass = StatusCombiner.class;
+ var statusCombinerClass =
org.apache.accumulo.server.replication.StatusCombiner.class;
IteratorSetting setting =
new IteratorSetting(9, ReplicationTableUtil.COMBINER_NAME,
statusCombinerClass);
Combiner.setColumns(setting, Collections.singletonList(new
Column(ReplicationSection.COLF)));
@@ -232,13 +227,15 @@ public class Initialize implements KeywordExecutable {
// add combiners to replication table
@SuppressWarnings("deprecation")
- String replicationCombinerName = ReplicationTable.COMBINER_NAME;
+ String replicationCombinerName =
+ org.apache.accumulo.core.replication.ReplicationTable.COMBINER_NAME;
setting = new IteratorSetting(30, replicationCombinerName,
statusCombinerClass);
setting.setPriority(30);
@SuppressWarnings("deprecation")
- Text statusSectionName = StatusSection.NAME;
+ Text statusSectionName =
+
org.apache.accumulo.core.replication.ReplicationSchema.StatusSection.NAME;
@SuppressWarnings("deprecation")
- Text workSectionName = WorkSection.NAME;
+ Text workSectionName =
org.apache.accumulo.core.replication.ReplicationSchema.WorkSection.NAME;
Combiner.setColumns(setting,
Arrays.asList(new Column(statusSectionName), new
Column(workSectionName)));
for (IteratorScope scope : EnumSet.allOf(IteratorScope.class)) {
@@ -252,7 +249,8 @@ public class Initialize implements KeywordExecutable {
}
// add locality groups to replication table
@SuppressWarnings("deprecation")
- Map<String,Set<Text>> replicationLocalityGroups =
ReplicationTable.LOCALITY_GROUPS;
+ Map<String,Set<Text>> replicationLocalityGroups =
+ org.apache.accumulo.core.replication.ReplicationTable.LOCALITY_GROUPS;
for (Entry<String,Set<Text>> g : replicationLocalityGroups.entrySet()) {
initialReplicationTableConf.put(Property.TABLE_LOCALITY_GROUP_PREFIX +
g.getKey(),
LocalityGroupUtil.encodeColumnFamilies(g.getValue()));
@@ -261,7 +259,8 @@ public class Initialize implements KeywordExecutable {
Joiner.on(",").join(replicationLocalityGroups.keySet()));
// add formatter to replication table
@SuppressWarnings("deprecation")
- String replicationFormatterClassName =
ReplicationUtil.STATUS_FORMATTER_CLASS_NAME;
+ String replicationFormatterClassName =
+
org.apache.accumulo.server.replication.ReplicationUtil.STATUS_FORMATTER_CLASS_NAME;
initialReplicationTableConf.put(Property.TABLE_FORMATTER_CLASS.getKey(),
replicationFormatterClassName);
}
@@ -618,7 +617,7 @@ public class Initialize implements KeywordExecutable {
TableManager.prepareNewTableState(zoo, uuid, MetadataTable.ID,
Namespace.ACCUMULO.id(),
MetadataTable.NAME, TableState.ONLINE, NodeExistsPolicy.FAIL);
@SuppressWarnings("deprecation")
- String replicationTableName = ReplicationTable.NAME;
+ String replicationTableName =
org.apache.accumulo.core.replication.ReplicationTable.NAME;
TableManager.prepareNewTableState(zoo, uuid, REPLICATION_TABLE,
Namespace.ACCUMULO.id(),
replicationTableName, TableState.OFFLINE, NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZTSERVERS,
EMPTY_BYTE_ARRAY,
@@ -654,11 +653,12 @@ public class Initialize implements KeywordExecutable {
zoo.putPersistentData(zkInstanceRoot + Constants.ZMONITOR_LOCK,
EMPTY_BYTE_ARRAY,
NodeExistsPolicy.FAIL);
@SuppressWarnings("deprecation")
- String replicationZBase = ReplicationConstants.ZOO_BASE;
+ String replicationZBase =
org.apache.accumulo.core.replication.ReplicationConstants.ZOO_BASE;
zoo.putPersistentData(zkInstanceRoot + replicationZBase, EMPTY_BYTE_ARRAY,
NodeExistsPolicy.FAIL);
@SuppressWarnings("deprecation")
- String replicationZServers = ReplicationConstants.ZOO_TSERVERS;
+ String replicationZServers =
+ org.apache.accumulo.core.replication.ReplicationConstants.ZOO_TSERVERS;
zoo.putPersistentData(zkInstanceRoot + replicationZServers,
EMPTY_BYTE_ARRAY,
NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + WalStateManager.ZWALS,
EMPTY_BYTE_ARRAY,
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
index 2e19628..ebc86df 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
@@ -44,7 +44,6 @@ import org.apache.accumulo.core.dataImpl.thrift.TRange;
import org.apache.accumulo.core.manager.thrift.FateOperation;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
-import org.apache.accumulo.core.replication.ReplicationTable;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.NamespacePermission;
import org.apache.accumulo.core.security.SystemPermission;
@@ -368,7 +367,7 @@ public class SecurityOperation {
targetUserExists(user);
@SuppressWarnings("deprecation")
- TableId replicationTableId = ReplicationTable.ID;
+ TableId replicationTableId =
org.apache.accumulo.core.replication.ReplicationTable.ID;
if ((table.equals(MetadataTable.ID) || table.equals(RootTable.ID)
|| table.equals(replicationTableId)) &&
permission.equals(TablePermission.READ))
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
index d8934e2..2fd59f7 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
@@ -47,8 +47,6 @@ import org.apache.accumulo.core.metadata.MetadataTable;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection;
import org.apache.accumulo.core.protobuf.ProtobufUtil;
import
org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException;
-import org.apache.accumulo.server.replication.StatusCombiner;
-import org.apache.accumulo.server.replication.StatusFormatter;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
@@ -65,7 +63,8 @@ public class ReplicationTableUtil {
public static final String COMBINER_NAME = "replcombiner";
@SuppressWarnings("deprecation")
- public static final String STATUS_FORMATTER_CLASS_NAME =
StatusFormatter.class.getName();
+ public static final String STATUS_FORMATTER_CLASS_NAME =
+ org.apache.accumulo.server.replication.StatusFormatter.class.getName();
private ReplicationTableUtil() {}
@@ -106,7 +105,7 @@ public class ReplicationTableUtil {
// Set our combiner and combine all columns
// Need to set the combiner beneath versioning since we don't want to
turn it off
@SuppressWarnings("deprecation")
- Class<StatusCombiner> statusCombinerClass = StatusCombiner.class;
+ var statusCombinerClass =
org.apache.accumulo.server.replication.StatusCombiner.class;
IteratorSetting setting = new IteratorSetting(9, COMBINER_NAME,
statusCombinerClass);
Combiner.setColumns(setting, Collections.singletonList(new
Column(ReplicationSection.COLF)));
try {
diff --git
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index 958e3a5..fcd1edf 100644
---
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -41,9 +41,6 @@ import org.apache.accumulo.core.metadata.TabletLocationState;
import org.apache.accumulo.core.metadata.TabletState;
import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection;
-import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
-import org.apache.accumulo.core.replication.ReplicationTable;
-import org.apache.accumulo.core.replication.ReplicationTableOfflineException;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.Pair;
@@ -360,14 +357,14 @@ public class GarbageCollectWriteAheadLogs {
protected int removeReplicationEntries(Map<UUID,TServerInstance> candidates)
{
try {
try {
- final Scanner s = ReplicationTable.getScanner(context);
- StatusSection.limit(s);
+ final Scanner s =
org.apache.accumulo.core.replication.ReplicationTable.getScanner(context);
+
org.apache.accumulo.core.replication.ReplicationSchema.StatusSection.limit(s);
for (Entry<Key,Value> entry : s) {
UUID id = path2uuid(new Path(entry.getKey().getRow().toString()));
candidates.remove(id);
log.info("Ignore closed log " + id + " because it is being
replicated");
}
- } catch (ReplicationTableOfflineException ex) {
+ } catch
(org.apache.accumulo.core.replication.ReplicationTableOfflineException ex) {
return candidates.size();
}
diff --git
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index cbfb265..64a2b39 100644
---
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -37,7 +37,6 @@ import org.apache.accumulo.core.data.TableId;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.gc.GarbageCollectionEnvironment.Reference;
-import org.apache.accumulo.server.replication.StatusUtil;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -235,7 +234,8 @@ public class GarbageCollectionAlgorithm {
// We cannot delete a file if it is still needed for replication
@SuppressWarnings("deprecation")
- boolean safeToRemove =
StatusUtil.isSafeForRemoval(pendingReplica.getValue());
+ boolean safeToRemove =
org.apache.accumulo.server.replication.StatusUtil
+ .isSafeForRemoval(pendingReplica.getValue());
if (!safeToRemove) {
// If it must be replicated, we must remove it from the candidate
set to prevent deletion
candidates.remove();
diff --git
a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index f0d844e..3c10c2b 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -64,9 +64,6 @@ import
org.apache.accumulo.core.metadata.schema.MetadataSchema.BlipSection;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
import org.apache.accumulo.core.metrics.MetricsUtil;
-import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
-import org.apache.accumulo.core.replication.ReplicationTable;
-import org.apache.accumulo.core.replication.ReplicationTableOfflineException;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.accumulo.core.trace.TraceUtil;
@@ -83,7 +80,6 @@ import
org.apache.accumulo.fate.zookeeper.ServiceLock.LockLossReason;
import org.apache.accumulo.fate.zookeeper.ServiceLock.LockWatcher;
import org.apache.accumulo.gc.metrics.GcCycleMetrics;
import org.apache.accumulo.gc.metrics.GcMetrics;
-import org.apache.accumulo.gc.replication.CloseWriteAheadLogReferences;
import org.apache.accumulo.server.AbstractServer;
import org.apache.accumulo.server.ServerOpts;
import org.apache.accumulo.server.fs.VolumeManager;
@@ -424,8 +420,8 @@ public class SimpleGarbageCollector extends AbstractServer
implements Iface {
public Iterator<Entry<String,Status>> getReplicationNeededIterator() {
AccumuloClient client = getContext();
try {
- Scanner s = ReplicationTable.getScanner(client);
- StatusSection.limit(s);
+ Scanner s =
org.apache.accumulo.core.replication.ReplicationTable.getScanner(client);
+
org.apache.accumulo.core.replication.ReplicationSchema.StatusSection.limit(s);
return Iterators.transform(s.iterator(), input -> {
String file = input.getKey().getRow().toString();
Status stat;
@@ -437,7 +433,7 @@ public class SimpleGarbageCollector extends AbstractServer
implements Iface {
}
return Maps.immutableEntry(file, stat);
});
- } catch (ReplicationTableOfflineException e) {
+ } catch
(org.apache.accumulo.core.replication.ReplicationTableOfflineException e) {
// No elements that we need to preclude
return Collections.emptyIterator();
}
@@ -532,7 +528,8 @@ public class SimpleGarbageCollector extends AbstractServer
implements Iface {
Span replSpan = TraceUtil.startSpan(this.getClass(),
"replicationClose");
try (Scope replScope = replSpan.makeCurrent()) {
@SuppressWarnings("deprecation")
- CloseWriteAheadLogReferences closeWals = new
CloseWriteAheadLogReferences(getContext());
+ Runnable closeWals =
+ new
org.apache.accumulo.gc.replication.CloseWriteAheadLogReferences(getContext());
closeWals.run();
} catch (Exception e) {
TraceUtil.setException(replSpan, e, false);
diff --git
a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
index ba0b410..4e60332 100644
---
a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
+++
b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
@@ -37,7 +37,6 @@ import org.apache.accumulo.core.metadata.TServerInstance;
import org.apache.accumulo.core.metadata.TabletLocationState;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection;
import org.apache.accumulo.core.replication.ReplicationSchema;
-import org.apache.accumulo.core.replication.ReplicationTable;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.server.ServerContext;
@@ -53,7 +52,8 @@ import org.junit.Test;
public class GarbageCollectWriteAheadLogsTest {
@SuppressWarnings("deprecation")
- private static final String REPL_TABLE_NAME = ReplicationTable.NAME;
+ private static final String REPL_TABLE_NAME =
+ org.apache.accumulo.core.replication.ReplicationTable.NAME;
@SuppressWarnings("deprecation")
private static final Text STATUS_SECTION_NAME =
ReplicationSchema.StatusSection.NAME;
diff --git
a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
index 7604d23..591c750 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
@@ -36,7 +36,6 @@ import java.util.stream.Stream;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.data.TableId;
-import org.apache.accumulo.server.replication.StatusUtil;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.junit.Test;
@@ -708,7 +707,8 @@ public class GarbageCollectionTest {
// We replicated all of the data, but we might still write more data to
the file
@SuppressWarnings("deprecation")
- Status status = StatusUtil.fileCreated(System.currentTimeMillis());
+ Status status =
+
org.apache.accumulo.server.replication.StatusUtil.fileCreated(System.currentTimeMillis());
gce.filesToReplicate.put("hdfs://foo.com:6000/accumulo/tables/1/t-00001/A000001.rf",
status);
gca.collect(gce);
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index bcd792d..66561ae 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@ -107,9 +107,6 @@ import
org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
import org.apache.accumulo.manager.metrics.ManagerMetrics;
import org.apache.accumulo.manager.recovery.RecoveryManager;
-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;
import org.apache.accumulo.manager.tableOps.TraceRepo;
import org.apache.accumulo.manager.upgrade.UpgradeCoordinator;
@@ -127,7 +124,6 @@ import org.apache.accumulo.server.manager.state.MergeInfo;
import org.apache.accumulo.server.manager.state.MergeState;
import org.apache.accumulo.server.manager.state.TabletServerState;
import org.apache.accumulo.server.manager.state.TabletStateStore;
-import org.apache.accumulo.server.replication.ZooKeeperInitialization;
import org.apache.accumulo.server.rpc.HighlyAvailableServiceWrapper;
import org.apache.accumulo.server.rpc.ServerAddress;
import org.apache.accumulo.server.rpc.TCredentialsUpdatingWrapper;
@@ -1265,7 +1261,8 @@ public class Manager extends AbstractServer
@Deprecated
private void initializeZkForReplication(ZooReaderWriter zReaderWriter,
String zroot) {
try {
- ZooKeeperInitialization.ensureZooKeeperInitialized(zReaderWriter, zroot);
+ org.apache.accumulo.server.replication.ZooKeeperInitialization
+ .ensureZooKeeperInitialized(zReaderWriter, zroot);
} catch (KeeperException | InterruptedException e) {
throw new IllegalStateException("Exception while ensuring ZooKeeper is
initialized", e);
}
@@ -1360,7 +1357,7 @@ public class Manager extends AbstractServer
throws UnknownHostException, KeeperException, InterruptedException {
ServerContext context = getContext();
// Start the replication coordinator which assigns tservers to service
replication requests
- ManagerReplicationCoordinator impl = new
ManagerReplicationCoordinator(this);
+ var impl = new
org.apache.accumulo.manager.replication.ManagerReplicationCoordinator(this);
ReplicationCoordinator.Iface haReplicationProxy =
HighlyAvailableServiceWrapper.service(impl, this);
ReplicationCoordinator.Processor<ReplicationCoordinator.Iface>
replicationCoordinatorProcessor =
@@ -1373,11 +1370,12 @@ public class Manager extends AbstractServer
log.info("Started replication coordinator service at " +
replAddress.address);
// Start the daemon to scan the replication table and make units of work
- replicationWorkThread = Threads.createThread("Replication Driver", new
ReplicationDriver(this));
+ replicationWorkThread = Threads.createThread("Replication Driver",
+ new org.apache.accumulo.manager.replication.ReplicationDriver(this));
replicationWorkThread.start();
// Start the daemon to assign work to tservers to replicate to our peers
- WorkDriver wd = new WorkDriver(this);
+ var wd = new org.apache.accumulo.manager.replication.WorkDriver(this);
replicationAssignerThread = Threads.createThread(wd.getName(), wd);
replicationAssignerThread.start();
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
index 63835cf..7c34ba3 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
@@ -71,8 +71,6 @@ import
org.apache.accumulo.core.metadata.schema.TabletDeletedException;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
import org.apache.accumulo.core.protobuf.ProtobufUtil;
-import org.apache.accumulo.core.replication.ReplicationSchema.OrderSection;
-import org.apache.accumulo.core.replication.ReplicationTable;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.accumulo.core.securityImpl.thrift.TDelegationToken;
@@ -84,7 +82,6 @@ import org.apache.accumulo.manager.tableOps.TraceRepo;
import org.apache.accumulo.manager.tserverOps.ShutdownTServer;
import org.apache.accumulo.server.client.ClientServiceHandler;
import org.apache.accumulo.server.manager.LiveTServerSet.TServerConnection;
-import org.apache.accumulo.server.replication.StatusUtil;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import
org.apache.accumulo.server.security.delegation.AuthenticationTokenSecretManager;
import org.apache.accumulo.server.util.NamespacePropUtil;
@@ -528,7 +525,8 @@ public class ManagerClientServiceHandler extends
FateServiceHandler
drainLog.trace("reading from replication table");
try {
- bs = client.createBatchScanner(ReplicationTable.NAME,
Authorizations.EMPTY, 4);
+ bs =
client.createBatchScanner(org.apache.accumulo.core.replication.ReplicationTable.NAME,
+ Authorizations.EMPTY, 4);
} catch (TableNotFoundException e) {
throw new RuntimeException("Replication table was not found", e);
}
@@ -565,9 +563,12 @@ public class ManagerClientServiceHandler extends
FateServiceHandler
if (colfHolder.equals(ReplicationSection.COLF)) {
file = rowHolder.toString();
file = file.substring(ReplicationSection.getRowPrefix().length());
- } else if (colfHolder.equals(OrderSection.NAME)) {
- file = OrderSection.getFile(entry.getKey(), rowHolder);
- long timeClosed = OrderSection.getTimeClosed(entry.getKey(),
rowHolder);
+ } else if (colfHolder
+
.equals(org.apache.accumulo.core.replication.ReplicationSchema.OrderSection.NAME))
{
+ file =
org.apache.accumulo.core.replication.ReplicationSchema.OrderSection
+ .getFile(entry.getKey(), rowHolder);
+ long timeClosed =
org.apache.accumulo.core.replication.ReplicationSchema.OrderSection
+ .getTimeClosed(entry.getKey(), rowHolder);
drainLog.trace("Order section: {} and {}", timeClosed, file);
} else {
file = rowHolder.toString();
@@ -583,7 +584,7 @@ public class ManagerClientServiceHandler extends
FateServiceHandler
try {
Status stat = Status.parseFrom(entry.getValue().get());
- if (!StatusUtil.isFullyReplicated(stat)) {
+ if
(!org.apache.accumulo.server.replication.StatusUtil.isFullyReplicated(stat)) {
drainLog.trace("{} and {} is not replicated", file,
ProtobufUtil.toString(stat));
return false;
}
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 993b57a..e35b7e8 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
@@ -73,7 +73,6 @@ import
org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.Location;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.LocationType;
import org.apache.accumulo.core.metrics.MetricsUtil;
-import org.apache.accumulo.core.replication.ReplicationConstants;
import org.apache.accumulo.core.replication.thrift.ReplicationServicer;
import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.spi.fs.VolumeChooserEnvironment;
@@ -111,7 +110,6 @@ import org.apache.accumulo.server.log.SortedLogState;
import org.apache.accumulo.server.log.WalStateManager;
import org.apache.accumulo.server.log.WalStateManager.WalMarkerException;
import org.apache.accumulo.server.manager.recovery.RecoveryPath;
-import org.apache.accumulo.server.replication.ZooKeeperInitialization;
import org.apache.accumulo.server.rpc.ServerAddress;
import org.apache.accumulo.server.rpc.TCredentialsUpdatingWrapper;
import org.apache.accumulo.server.rpc.TServerUtils;
@@ -140,8 +138,6 @@ import
org.apache.accumulo.tserver.metrics.TabletServerMetrics;
import org.apache.accumulo.tserver.metrics.TabletServerMinCMetrics;
import org.apache.accumulo.tserver.metrics.TabletServerScanMetrics;
import org.apache.accumulo.tserver.metrics.TabletServerUpdateMetrics;
-import org.apache.accumulo.tserver.replication.ReplicationServicerHandler;
-import org.apache.accumulo.tserver.replication.ReplicationWorker;
import org.apache.accumulo.tserver.scan.ScanRunState;
import org.apache.accumulo.tserver.session.Session;
import org.apache.accumulo.tserver.session.SessionManager;
@@ -192,7 +188,7 @@ public class TabletServer extends AbstractServer {
private final LogSorter logSorter;
@SuppressWarnings("deprecation")
- private ReplicationWorker replWorker = null;
+ private org.apache.accumulo.tserver.replication.ReplicationWorker replWorker
= null;
final TabletStatsKeeper statsKeeper;
private final AtomicInteger logIdGenerator = new AtomicInteger();
@@ -248,7 +244,7 @@ public class TabletServer extends AbstractServer {
this.sessionManager = new SessionManager(context);
this.logSorter = new LogSorter(context, aconf);
@SuppressWarnings("deprecation")
- ReplicationWorker replWorker = new ReplicationWorker(context);
+ var replWorker = new
org.apache.accumulo.tserver.replication.ReplicationWorker(context);
this.replWorker = replWorker;
this.statsKeeper = new TabletStatsKeeper();
final int numBusyTabletsToLog =
aconf.getCount(Property.TSERV_LOG_BUSY_TABLETS_COUNT);
@@ -606,7 +602,8 @@ public class TabletServer extends AbstractServer {
@Deprecated
private void startReplicationService() throws UnknownHostException {
- final ReplicationServicerHandler handler = new
ReplicationServicerHandler(this);
+ final var handler =
+ new
org.apache.accumulo.tserver.replication.ReplicationServicerHandler(this);
ReplicationServicer.Iface rpcProxy = TraceUtil.wrapService(handler);
ReplicationServicer.Iface repl =
TCredentialsUpdatingWrapper.service(rpcProxy, handler.getClass(),
getConfiguration());
@@ -626,9 +623,9 @@ public class TabletServer extends AbstractServer {
// The replication service is unique to the thrift service for a
tserver, not just a host.
// Advertise the host and port for replication service given the host
and port for the
// tserver.
- getContext().getZooReaderWriter().putPersistentData(
- getContext().getZooKeeperRoot() + ReplicationConstants.ZOO_TSERVERS
+ "/" + clientAddress,
- sp.address.toString().getBytes(UTF_8), NodeExistsPolicy.OVERWRITE);
+
getContext().getZooReaderWriter().putPersistentData(getContext().getZooKeeperRoot()
+ +
org.apache.accumulo.core.replication.ReplicationConstants.ZOO_TSERVERS + "/"
+ + clientAddress, sp.address.toString().getBytes(UTF_8),
NodeExistsPolicy.OVERWRITE);
} catch (Exception e) {
log.error("Could not advertise replication service port", e);
throw new RuntimeException(e);
@@ -702,8 +699,8 @@ public class TabletServer extends AbstractServer {
@Deprecated
private void initializeZkForReplication() {
try {
-
ZooKeeperInitialization.ensureZooKeeperInitialized(getContext().getZooReaderWriter(),
- getContext().getZooKeeperRoot());
+
org.apache.accumulo.server.replication.ZooKeeperInitialization.ensureZooKeeperInitialized(
+ getContext().getZooReaderWriter(), getContext().getZooKeeperRoot());
} catch (KeeperException | InterruptedException e) {
throw new IllegalStateException("Exception while ensuring ZooKeeper is
initialized", e);
}
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index d2a15c0..1f4eaf9 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -39,14 +39,12 @@ import org.apache.accumulo.core.client.Durability;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.protobuf.ProtobufUtil;
-import org.apache.accumulo.core.replication.ReplicationConfigurationUtil;
import org.apache.accumulo.core.util.Halt;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.fate.util.Retry;
import org.apache.accumulo.fate.util.Retry.RetryFactory;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.fs.VolumeManager;
-import org.apache.accumulo.server.replication.StatusUtil;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.accumulo.server.util.ReplicationTableUtil;
import org.apache.accumulo.tserver.TabletMutations;
@@ -411,11 +409,13 @@ public class TabletServerLogger {
// Need to release
KeyExtent extent = commitSession.getExtent();
@SuppressWarnings("deprecation")
- boolean replicationEnabled =
ReplicationConfigurationUtil.isEnabled(extent,
- tserver.getTableConfiguration(extent));
+ boolean replicationEnabled =
+
org.apache.accumulo.core.replication.ReplicationConfigurationUtil
+ .isEnabled(extent,
tserver.getTableConfiguration(extent));
if (replicationEnabled) {
@SuppressWarnings("deprecation")
- Status status =
StatusUtil.openWithUnknownLength(System.currentTimeMillis());
+ Status status =
org.apache.accumulo.server.replication.StatusUtil
+ .openWithUnknownLength(System.currentTimeMillis());
log.debug("Writing " + ProtobufUtil.toString(status) + " to
metadata table for "
+ copy.getFileName());
// Got some new WALs, note this in the metadata table
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 e18909d..91826a2 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
@@ -42,12 +42,10 @@ import org.apache.accumulo.core.metadata.TServerInstance;
import org.apache.accumulo.core.metadata.TabletFile;
import org.apache.accumulo.core.metadata.schema.DataFileValue;
import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
-import org.apache.accumulo.core.replication.ReplicationConfigurationUtil;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.MapCounter;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.server.fs.VolumeManager;
-import org.apache.accumulo.server.replication.StatusUtil;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.accumulo.server.util.ManagerMetadataUtil;
import org.apache.accumulo.server.util.MetadataTableUtil;
@@ -318,8 +316,8 @@ class DatafileManager {
Set<String> unusedWalLogs = tablet.beginClearingUnusedLogs();
@SuppressWarnings("deprecation")
- boolean replicate =
- ReplicationConfigurationUtil.isEnabled(tablet.getExtent(),
tablet.getTableConfiguration());
+ boolean replicate =
org.apache.accumulo.core.replication.ReplicationConfigurationUtil
+ .isEnabled(tablet.getExtent(), tablet.getTableConfiguration());
Set<String> logFileOnly = null;
if (replicate) {
// unusedWalLogs is of the form host/fileURI, need to strip off the host
portion
@@ -356,7 +354,7 @@ class DatafileManager {
}
for (String logFile : logFileOnly) {
@SuppressWarnings("deprecation")
- Status status = StatusUtil.openWithUnknownLength();
+ Status status =
org.apache.accumulo.server.replication.StatusUtil.openWithUnknownLength();
ReplicationTableUtil.updateFiles(tablet.getContext(),
tablet.getExtent(), logFile,
status);
}
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 2035a0f..ac98e80 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
@@ -84,7 +84,6 @@ import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Se
import org.apache.accumulo.core.metadata.schema.MetadataTime;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
import org.apache.accumulo.core.protobuf.ProtobufUtil;
-import org.apache.accumulo.core.replication.ReplicationConfigurationUtil;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.spi.fs.VolumeChooserEnvironment;
@@ -106,7 +105,6 @@ import org.apache.accumulo.server.fs.VolumeUtil.TabletFiles;
import org.apache.accumulo.server.problems.ProblemReport;
import org.apache.accumulo.server.problems.ProblemReports;
import org.apache.accumulo.server.problems.ProblemType;
-import org.apache.accumulo.server.replication.StatusUtil;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.accumulo.server.tablets.TabletTime;
import org.apache.accumulo.server.tablets.UniqueNameAllocator;
@@ -328,8 +326,8 @@ public class Tablet {
// translate any volume changes
@SuppressWarnings("deprecation")
- boolean replicationEnabled =
- ReplicationConfigurationUtil.isEnabled(extent,
this.tableConfiguration);
+ boolean replicationEnabled =
org.apache.accumulo.core.replication.ReplicationConfigurationUtil
+ .isEnabled(extent, this.tableConfiguration);
TabletFiles tabletPaths =
new TabletFiles(data.getDirectoryName(), data.getLogEntries(),
data.getDataFiles());
tabletPaths = VolumeUtil.updateTabletVolumes(tabletServer.getContext(),
tabletServer.getLock(),
@@ -389,8 +387,9 @@ public class Tablet {
commitSession.updateMaxCommittedTime(tabletTime.getTime());
@SuppressWarnings("deprecation")
- boolean replicationEnabledForTable =
ReplicationConfigurationUtil.isEnabled(extent,
- tabletServer.getTableConfiguration(extent));
+ boolean replicationEnabledForTable =
+
org.apache.accumulo.core.replication.ReplicationConfigurationUtil.isEnabled(extent,
+ tabletServer.getTableConfiguration(extent));
if (entriesUsedOnTablet.get() == 0) {
log.debug("No replayed mutations applied, removing unused entries
for {}", extent);
MetadataTableUtil.removeUnusedWALEntries(getTabletServer().getContext(), extent,
@@ -399,7 +398,7 @@ public class Tablet {
} else if (replicationEnabledForTable) {
// record that logs may have data for this extent
@SuppressWarnings("deprecation")
- Status status = StatusUtil.openWithUnknownLength();
+ Status status =
org.apache.accumulo.server.replication.StatusUtil.openWithUnknownLength();
for (LogEntry logEntry : logEntries) {
log.debug("Writing updated status to metadata table for {} {}",
logEntry.filename,
ProtobufUtil.toString(status));
diff --git
a/test/src/main/java/org/apache/accumulo/test/ManagerRepairsDualAssignmentIT.java
b/test/src/main/java/org/apache/accumulo/test/ManagerRepairsDualAssignmentIT.java
index cfb4a73..a48fae0 100644
---
a/test/src/main/java/org/apache/accumulo/test/ManagerRepairsDualAssignmentIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ManagerRepairsDualAssignmentIT.java
@@ -40,7 +40,6 @@ import org.apache.accumulo.core.metadata.TabletLocationState;
import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
import org.apache.accumulo.core.metadata.schema.Ample.TabletMutator;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.LocationType;
-import org.apache.accumulo.core.replication.ReplicationTable;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.fate.util.UtilWaitThread;
import org.apache.accumulo.minicluster.ServerType;
@@ -107,7 +106,7 @@ public class ManagerRepairsDualAssignmentIT extends
ConfigurableMacBase {
cluster.getProcesses().get(ServerType.TABLET_SERVER).iterator().next());
Set<TServerInstance> replStates = new HashSet<>();
@SuppressWarnings("deprecation")
- TableId repTable = ReplicationTable.ID;
+ TableId repTable =
org.apache.accumulo.core.replication.ReplicationTable.ID;
// Find out which tablet server remains
while (true) {
UtilWaitThread.sleep(1000);
