This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/elasticity by this push:
new c766525a6a Rename Fate store implementations (#4393)
c766525a6a is described below
commit c766525a6a4dba5d1be1d76f56cdecdb225cebd9
Author: Christopher L. Shannon <cshan...@apache.org>
AuthorDate: Sat Mar 16 15:20:04 2024 -0400
Rename Fate store implementations (#4393)
This renames ZooStore to MetaFateStore and AccumuloStore to
UserFateStore to be more descriptive and better align with what the
different Fate stores are used for. This also aligns the names with the
FateInstanceType enum.
This closes #4253
---
.../java/org/apache/accumulo/core/fate/Fate.java | 2 +-
.../fate/{ZooStore.java => MetaFateStore.java} | 15 +++++----
.../core/fate/{accumulo => user}/FateMutator.java | 2 +-
.../fate/{accumulo => user}/FateMutatorImpl.java | 14 ++++----
.../{accumulo => user}/StatusMappingIterator.java | 4 +--
.../AccumuloStore.java => user/UserFateStore.java} | 18 +++++-----
.../fate/{accumulo => user}/schema/FateSchema.java | 2 +-
.../org/apache/accumulo/server/util/Admin.java | 12 +++----
.../java/org/apache/accumulo/manager/Manager.java | 8 ++---
.../accumulo/manager/metrics/fate/FateMetrics.java | 8 ++---
.../manager/upgrade/UpgradeCoordinator.java | 4 +--
.../test/compaction/ExternalCompaction_1_IT.java | 38 +++++++++++-----------
.../test/fate/{accumulo => }/FateStoreIT.java | 3 +-
.../ZookeeperFateIT.java => meta/MetaFateIT.java} | 14 ++++----
.../MetaFateOpsCommandsIT.java} | 8 ++---
.../MetaFateStoreFateIT.java} | 14 ++++----
.../fate/{zookeeper => meta}/ZooMutatorIT.java | 2 +-
.../fate/{accumulo => user}/FateMutatorImplIT.java | 8 ++---
.../AccumuloFateIT.java => user/UserFateIT.java} | 12 +++----
.../UserFateOpsCommandsIT.java} | 8 ++---
.../UserFateStoreFateIT.java} | 15 +++++----
.../UserFateStoreIT.java} | 21 ++++++------
.../test/functional/FateConcurrencyIT.java | 16 +++++----
.../test/functional/FunctionalTestUtils.java | 5 +--
24 files changed, 129 insertions(+), 124 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/Fate.java
b/core/src/main/java/org/apache/accumulo/core/fate/Fate.java
index e5be68dbb2..eed785b39b 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/Fate.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/Fate.java
@@ -164,7 +164,7 @@ public class Fate<T> {
// Here, deferTime is only used to determine success (zero) or
failure (non-zero),
// proceeding on success and returning to the while loop on
failure.
- // The value of deferTime is only used as a wait time in
ZooStore.unreserve
+ // The value of deferTime is only used as a wait time in
FateStore.unreserve
if (deferTime == 0) {
prevOp = op;
if (status == SUBMITTED) {
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/ZooStore.java
b/core/src/main/java/org/apache/accumulo/core/fate/MetaFateStore.java
similarity index 96%
rename from core/src/main/java/org/apache/accumulo/core/fate/ZooStore.java
rename to core/src/main/java/org/apache/accumulo/core/fate/MetaFateStore.java
index 77f7a50a6e..70f93211a4 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/ZooStore.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/MetaFateStore.java
@@ -54,9 +54,9 @@ import com.google.common.base.Suppliers;
//TODO use zoocache? - ACCUMULO-1297
//TODO handle zookeeper being down gracefully - ACCUMULO-1297
-public class ZooStore<T> extends AbstractFateStore<T> {
+public class MetaFateStore<T> extends AbstractFateStore<T> {
- private static final Logger log = LoggerFactory.getLogger(ZooStore.class);
+ private static final Logger log =
LoggerFactory.getLogger(MetaFateStore.class);
private static final FateInstanceType fateInstanceType =
FateInstanceType.META;
private String path;
private ZooReaderWriter zk;
@@ -65,13 +65,14 @@ public class ZooStore<T> extends AbstractFateStore<T> {
return path + "/tx_" + fateId.getTxUUIDStr();
}
- public ZooStore(String path, ZooReaderWriter zk) throws KeeperException,
InterruptedException {
+ public MetaFateStore(String path, ZooReaderWriter zk)
+ throws KeeperException, InterruptedException {
this(path, zk, DEFAULT_MAX_DEFERRED, DEFAULT_FATE_ID_GENERATOR);
}
@VisibleForTesting
- public ZooStore(String path, ZooReaderWriter zk, int maxDeferred,
FateIdGenerator fateIdGenerator)
- throws KeeperException, InterruptedException {
+ public MetaFateStore(String path, ZooReaderWriter zk, int maxDeferred,
+ FateIdGenerator fateIdGenerator) throws KeeperException,
InterruptedException {
super(maxDeferred, fateIdGenerator);
this.path = path;
this.zk = zk;
@@ -82,7 +83,7 @@ public class ZooStore<T> extends AbstractFateStore<T> {
/**
* For testing only
*/
- ZooStore() {}
+ MetaFateStore() {}
@Override
public FateId create() {
@@ -257,7 +258,7 @@ public class ZooStore<T> extends AbstractFateStore<T> {
public Serializable getTransactionInfo(Fate.TxInfo txInfo) {
verifyReserved(false);
- return ZooStore.this.getTransactionInfo(txInfo, fateId);
+ return MetaFateStore.this.getTransactionInfo(txInfo, fateId);
}
@Override
diff --git
a/core/src/main/java/org/apache/accumulo/core/fate/accumulo/FateMutator.java
b/core/src/main/java/org/apache/accumulo/core/fate/user/FateMutator.java
similarity index 97%
rename from
core/src/main/java/org/apache/accumulo/core/fate/accumulo/FateMutator.java
rename to core/src/main/java/org/apache/accumulo/core/fate/user/FateMutator.java
index b538a9f665..b57ffae68f 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/accumulo/FateMutator.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/user/FateMutator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.core.fate.accumulo;
+package org.apache.accumulo.core.fate.user;
import org.apache.accumulo.core.fate.Fate;
import org.apache.accumulo.core.fate.FateKey;
diff --git
a/core/src/main/java/org/apache/accumulo/core/fate/accumulo/FateMutatorImpl.java
b/core/src/main/java/org/apache/accumulo/core/fate/user/FateMutatorImpl.java
similarity index 92%
rename from
core/src/main/java/org/apache/accumulo/core/fate/accumulo/FateMutatorImpl.java
rename to
core/src/main/java/org/apache/accumulo/core/fate/user/FateMutatorImpl.java
index 342bfc6e83..c794fdc3d6 100644
---
a/core/src/main/java/org/apache/accumulo/core/fate/accumulo/FateMutatorImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/user/FateMutatorImpl.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.core.fate.accumulo;
+package org.apache.accumulo.core.fate.user;
import static org.apache.accumulo.core.fate.AbstractFateStore.serialize;
-import static org.apache.accumulo.core.fate.accumulo.AccumuloStore.getRow;
-import static org.apache.accumulo.core.fate.accumulo.AccumuloStore.getRowId;
-import static org.apache.accumulo.core.fate.accumulo.AccumuloStore.invertRepo;
+import static org.apache.accumulo.core.fate.user.UserFateStore.getRow;
+import static org.apache.accumulo.core.fate.user.UserFateStore.getRowId;
+import static org.apache.accumulo.core.fate.user.UserFateStore.invertRepo;
import java.util.Objects;
@@ -41,9 +41,9 @@ import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.FateKey;
import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus;
import org.apache.accumulo.core.fate.Repo;
-import
org.apache.accumulo.core.fate.accumulo.schema.FateSchema.RepoColumnFamily;
-import org.apache.accumulo.core.fate.accumulo.schema.FateSchema.TxColumnFamily;
-import
org.apache.accumulo.core.fate.accumulo.schema.FateSchema.TxInfoColumnFamily;
+import org.apache.accumulo.core.fate.user.schema.FateSchema.RepoColumnFamily;
+import org.apache.accumulo.core.fate.user.schema.FateSchema.TxColumnFamily;
+import org.apache.accumulo.core.fate.user.schema.FateSchema.TxInfoColumnFamily;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.hadoop.io.Text;
diff --git
a/core/src/main/java/org/apache/accumulo/core/fate/accumulo/StatusMappingIterator.java
b/core/src/main/java/org/apache/accumulo/core/fate/user/StatusMappingIterator.java
similarity index 97%
rename from
core/src/main/java/org/apache/accumulo/core/fate/accumulo/StatusMappingIterator.java
rename to
core/src/main/java/org/apache/accumulo/core/fate/user/StatusMappingIterator.java
index 073f879318..1a0fae5aa3 100644
---
a/core/src/main/java/org/apache/accumulo/core/fate/accumulo/StatusMappingIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/fate/user/StatusMappingIterator.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.core.fate.accumulo;
+package org.apache.accumulo.core.fate.user;
-import static
org.apache.accumulo.core.fate.accumulo.schema.FateSchema.TxColumnFamily.STATUS_COLUMN;
+import static
org.apache.accumulo.core.fate.user.schema.FateSchema.TxColumnFamily.STATUS_COLUMN;
import java.io.IOException;
import java.util.Arrays;
diff --git
a/core/src/main/java/org/apache/accumulo/core/fate/accumulo/AccumuloStore.java
b/core/src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java
similarity index 95%
rename from
core/src/main/java/org/apache/accumulo/core/fate/accumulo/AccumuloStore.java
rename to
core/src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java
index 86438326c1..88de9e8fcf 100644
---
a/core/src/main/java/org/apache/accumulo/core/fate/accumulo/AccumuloStore.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.core.fate.accumulo;
+package org.apache.accumulo.core.fate.user;
import java.io.Serializable;
import java.util.List;
@@ -42,9 +42,9 @@ import org.apache.accumulo.core.fate.FateKey;
import org.apache.accumulo.core.fate.ReadOnlyRepo;
import org.apache.accumulo.core.fate.Repo;
import org.apache.accumulo.core.fate.StackOverflowException;
-import
org.apache.accumulo.core.fate.accumulo.schema.FateSchema.RepoColumnFamily;
-import org.apache.accumulo.core.fate.accumulo.schema.FateSchema.TxColumnFamily;
-import
org.apache.accumulo.core.fate.accumulo.schema.FateSchema.TxInfoColumnFamily;
+import org.apache.accumulo.core.fate.user.schema.FateSchema.RepoColumnFamily;
+import org.apache.accumulo.core.fate.user.schema.FateSchema.TxColumnFamily;
+import org.apache.accumulo.core.fate.user.schema.FateSchema.TxInfoColumnFamily;
import org.apache.accumulo.core.metadata.AccumuloTable;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.ColumnFQ;
@@ -57,9 +57,9 @@ import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
-public class AccumuloStore<T> extends AbstractFateStore<T> {
+public class UserFateStore<T> extends AbstractFateStore<T> {
- private static final Logger log =
LoggerFactory.getLogger(AccumuloStore.class);
+ private static final Logger log =
LoggerFactory.getLogger(UserFateStore.class);
private final ClientContext context;
private final String tableName;
@@ -69,19 +69,19 @@ public class AccumuloStore<T> extends AbstractFateStore<T> {
private static final com.google.common.collect.Range<Integer> REPO_RANGE =
com.google.common.collect.Range.closed(1, maxRepos);
- public AccumuloStore(ClientContext context, String tableName) {
+ public UserFateStore(ClientContext context, String tableName) {
this(context, tableName, DEFAULT_MAX_DEFERRED, DEFAULT_FATE_ID_GENERATOR);
}
@VisibleForTesting
- public AccumuloStore(ClientContext context, String tableName, int
maxDeferred,
+ public UserFateStore(ClientContext context, String tableName, int
maxDeferred,
FateIdGenerator fateIdGenerator) {
super(maxDeferred, fateIdGenerator);
this.context = Objects.requireNonNull(context);
this.tableName = Objects.requireNonNull(tableName);
}
- public AccumuloStore(ClientContext context) {
+ public UserFateStore(ClientContext context) {
this(context, AccumuloTable.FATE.tableName());
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/fate/accumulo/schema/FateSchema.java
b/core/src/main/java/org/apache/accumulo/core/fate/user/schema/FateSchema.java
similarity index 97%
rename from
core/src/main/java/org/apache/accumulo/core/fate/accumulo/schema/FateSchema.java
rename to
core/src/main/java/org/apache/accumulo/core/fate/user/schema/FateSchema.java
index 73664f7a1b..b7b7846d18 100644
---
a/core/src/main/java/org/apache/accumulo/core/fate/accumulo/schema/FateSchema.java
+++
b/core/src/main/java/org/apache/accumulo/core/fate/user/schema/FateSchema.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.core.fate.accumulo.schema;
+package org.apache.accumulo.core.fate.user.schema;
import org.apache.accumulo.core.util.ColumnFQ;
import org.apache.hadoop.io.Text;
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 9cbd0c8e19..09435c4d8f 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
@@ -57,9 +57,9 @@ import org.apache.accumulo.core.fate.AdminUtil;
import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.FateInstanceType;
import org.apache.accumulo.core.fate.FateStore;
+import org.apache.accumulo.core.fate.MetaFateStore;
import org.apache.accumulo.core.fate.ReadOnlyFateStore;
-import org.apache.accumulo.core.fate.ZooStore;
-import org.apache.accumulo.core.fate.accumulo.AccumuloStore;
+import org.apache.accumulo.core.fate.user.UserFateStore;
import org.apache.accumulo.core.fate.zookeeper.ZooCache;
import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.core.lock.ServiceLock;
@@ -771,12 +771,12 @@ public class Admin implements KeywordExecutable {
var zTableLocksPath = ServiceLock.path(zkRoot + Constants.ZTABLE_LOCKS);
String fateZkPath = zkRoot + Constants.ZFATE;
ZooReaderWriter zk = context.getZooReaderWriter();
- ZooStore<Admin> zs = new ZooStore<>(fateZkPath, zk);
- AccumuloStore<Admin> as = new AccumuloStore<>(context);
+ MetaFateStore<Admin> mfs = new MetaFateStore<>(fateZkPath, zk);
+ UserFateStore<Admin> ufs = new UserFateStore<>(context);
Map<FateInstanceType,FateStore<Admin>> fateStores =
- Map.of(FateInstanceType.META, zs, FateInstanceType.USER, as);
+ Map.of(FateInstanceType.META, mfs, FateInstanceType.USER, ufs);
Map<FateInstanceType,ReadOnlyFateStore<Admin>> readOnlyFateStores =
- Map.of(FateInstanceType.META, zs, FateInstanceType.USER, as);
+ Map.of(FateInstanceType.META, mfs, FateInstanceType.USER, ufs);
if (fateOpsCommand.cancel) {
cancelSubmittedFateTxs(context, fateOpsCommand.fateIdList);
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 5f7ce20fad..174edd3dcf 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
@@ -77,8 +77,8 @@ import org.apache.accumulo.core.fate.FateCleaner;
import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.FateInstanceType;
import org.apache.accumulo.core.fate.FateStore;
-import org.apache.accumulo.core.fate.ZooStore;
-import org.apache.accumulo.core.fate.accumulo.AccumuloStore;
+import org.apache.accumulo.core.fate.MetaFateStore;
+import org.apache.accumulo.core.fate.user.UserFateStore;
import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
import org.apache.accumulo.core.lock.ServiceLock;
@@ -1073,9 +1073,9 @@ public class Manager extends AbstractServer
try {
var metaInstance = initializeFateInstance(context,
- new ZooStore<>(getZooKeeperRoot() + Constants.ZFATE,
context.getZooReaderWriter()));
+ new MetaFateStore<>(getZooKeeperRoot() + Constants.ZFATE,
context.getZooReaderWriter()));
var userInstance = initializeFateInstance(context,
- new AccumuloStore<>(context, AccumuloTable.FATE.tableName()));
+ new UserFateStore<>(context, AccumuloTable.FATE.tableName()));
if (!fateRefs.compareAndSet(null,
Map.of(FateInstanceType.META, metaInstance, FateInstanceType.USER,
userInstance))) {
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 1fc7dcf475..f109534aa5 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
@@ -25,8 +25,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.fate.MetaFateStore;
import org.apache.accumulo.core.fate.ReadOnlyFateStore;
-import org.apache.accumulo.core.fate.ZooStore;
import org.apache.accumulo.core.metrics.MetricsProducer;
import org.apache.accumulo.core.metrics.MetricsUtil;
import org.apache.accumulo.core.util.threads.ThreadPools;
@@ -49,7 +49,7 @@ public class FateMetrics implements MetricsProducer {
private static final String OP_TYPE_TAG = "op.type";
private final ServerContext context;
- private final ReadOnlyFateStore<FateMetrics> zooStore;
+ private final ReadOnlyFateStore<FateMetrics> fateStore;
private final String fateRootPath;
private final long refreshDelay;
@@ -71,7 +71,7 @@ public class FateMetrics implements MetricsProducer {
this.refreshDelay = Math.max(DEFAULT_MIN_REFRESH_DELAY,
minimumRefreshDelay);
try {
- this.zooStore = new ZooStore<>(fateRootPath,
context.getZooReaderWriter());
+ this.fateStore = new MetaFateStore<>(fateRootPath,
context.getZooReaderWriter());
} catch (KeeperException ex) {
throw new IllegalStateException(
"FATE Metrics - Failed to create zoo store - metrics unavailable",
ex);
@@ -86,7 +86,7 @@ public class FateMetrics implements MetricsProducer {
private void update() {
FateMetricValues metricValues =
- FateMetricValues.getFromZooKeeper(context, fateRootPath, zooStore);
+ FateMetricValues.getFromZooKeeper(context, fateRootPath, fateStore);
totalCurrentOpsGauge.set(metricValues.getCurrentFateOps());
totalOpsGauge.set(metricValues.getZkFateChildOpsTotal());
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java
b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java
index 162196a84b..a9ed1fd6be 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java
@@ -38,8 +38,8 @@ import
org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.NamespaceNotFoundException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.conf.ConfigCheckUtil;
+import org.apache.accumulo.core.fate.MetaFateStore;
import org.apache.accumulo.core.fate.ReadOnlyFateStore;
-import org.apache.accumulo.core.fate.ZooStore;
import org.apache.accumulo.core.metadata.schema.Ample;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.core.volume.Volume;
@@ -307,7 +307,7 @@ public class UpgradeCoordinator {
justification = "Want to immediately stop all manager threads on upgrade
error")
private void abortIfFateTransactions(ServerContext context) {
try {
- final ReadOnlyFateStore<UpgradeCoordinator> fate = new ZooStore<>(
+ final ReadOnlyFateStore<UpgradeCoordinator> fate = new MetaFateStore<>(
context.getZooKeeperRoot() + Constants.ZFATE,
context.getZooReaderWriter());
try (var idStream = fate.list()) {
if (idStream.findFirst().isPresent()) {
diff --git
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
index 16dd39b09f..b77b2f59b6 100644
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
@@ -77,8 +77,8 @@ import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.FateInstanceType;
import org.apache.accumulo.core.fate.FateKey;
import org.apache.accumulo.core.fate.FateStore;
-import org.apache.accumulo.core.fate.ZooStore;
-import org.apache.accumulo.core.fate.accumulo.AccumuloStore;
+import org.apache.accumulo.core.fate.MetaFateStore;
+import org.apache.accumulo.core.fate.user.UserFateStore;
import org.apache.accumulo.core.iterators.DevNull;
import org.apache.accumulo.core.iterators.Filter;
import org.apache.accumulo.core.iterators.IteratorEnvironment;
@@ -232,15 +232,15 @@ public class ExternalCompaction_1_IT extends
SharedMiniClusterBase {
@Test
public void testCompactionCommitAndDeadDetectionRoot() throws Exception {
var ctx = getCluster().getServerContext();
- FateStore<Manager> zkStore =
- new ZooStore<>(ctx.getZooKeeperRoot() + Constants.ZFATE,
ctx.getZooReaderWriter());
+ FateStore<Manager> metaFateStore =
+ new MetaFateStore<>(ctx.getZooKeeperRoot() + Constants.ZFATE,
ctx.getZooReaderWriter());
try (AccumuloClient c =
Accumulo.newClient().from(getClientProps()).build()) {
var tableId = ctx.getTableId(AccumuloTable.ROOT.tableName());
var allCids = new HashMap<TableId,List<ExternalCompactionId>>();
- var fateId = createCompactionCommitAndDeadMetadata(c, zkStore,
AccumuloTable.ROOT.tableName(),
- allCids);
- verifyCompactionCommitAndDead(zkStore, tableId, fateId,
allCids.get(tableId));
+ var fateId = createCompactionCommitAndDeadMetadata(c, metaFateStore,
+ AccumuloTable.ROOT.tableName(), allCids);
+ verifyCompactionCommitAndDead(metaFateStore, tableId, fateId,
allCids.get(tableId));
}
}
@@ -251,16 +251,16 @@ public class ExternalCompaction_1_IT extends
SharedMiniClusterBase {
@Test
public void testCompactionCommitAndDeadDetectionMeta() throws Exception {
var ctx = getCluster().getServerContext();
- FateStore<Manager> zkStore =
- new ZooStore<>(ctx.getZooKeeperRoot() + Constants.ZFATE,
ctx.getZooReaderWriter());
+ FateStore<Manager> metaFateStore =
+ new MetaFateStore<>(ctx.getZooKeeperRoot() + Constants.ZFATE,
ctx.getZooReaderWriter());
try (AccumuloClient c =
Accumulo.newClient().from(getClientProps()).build()) {
// Metadata table by default already has 2 tablets
var tableId = ctx.getTableId(AccumuloTable.METADATA.tableName());
var allCids = new HashMap<TableId,List<ExternalCompactionId>>();
- var fateId = createCompactionCommitAndDeadMetadata(c, zkStore,
+ var fateId = createCompactionCommitAndDeadMetadata(c, metaFateStore,
AccumuloTable.METADATA.tableName(), allCids);
- verifyCompactionCommitAndDead(zkStore, tableId, fateId,
allCids.get(tableId));
+ verifyCompactionCommitAndDead(metaFateStore, tableId, fateId,
allCids.get(tableId));
}
}
@@ -274,7 +274,7 @@ public class ExternalCompaction_1_IT extends
SharedMiniClusterBase {
final String tableName = getUniqueNames(1)[0];
try (AccumuloClient c =
Accumulo.newClient().from(getClientProps()).build()) {
- AccumuloStore<Manager> accumuloStore = new AccumuloStore<>(ctx);
+ UserFateStore<Manager> userFateStore = new UserFateStore<>(ctx);
SortedSet<Text> splits = new TreeSet<>();
splits.add(new Text(row(MAX_DATA / 2)));
c.tableOperations().create(tableName, new
NewTableConfiguration().withSplits(splits));
@@ -282,8 +282,8 @@ public class ExternalCompaction_1_IT extends
SharedMiniClusterBase {
var tableId = ctx.getTableId(tableName);
var allCids = new HashMap<TableId,List<ExternalCompactionId>>();
- var fateId = createCompactionCommitAndDeadMetadata(c, accumuloStore,
tableName, allCids);
- verifyCompactionCommitAndDead(accumuloStore, tableId, fateId,
allCids.get(tableId));
+ var fateId = createCompactionCommitAndDeadMetadata(c, userFateStore,
tableName, allCids);
+ verifyCompactionCommitAndDead(userFateStore, tableId, fateId,
allCids.get(tableId));
}
}
@@ -297,9 +297,9 @@ public class ExternalCompaction_1_IT extends
SharedMiniClusterBase {
final String userTable = getUniqueNames(1)[0];
try (AccumuloClient c =
Accumulo.newClient().from(getClientProps()).build()) {
- AccumuloStore<Manager> accumuloStore = new AccumuloStore<>(ctx);
- FateStore<Manager> zkStore =
- new ZooStore<>(ctx.getZooKeeperRoot() + Constants.ZFATE,
ctx.getZooReaderWriter());
+ UserFateStore<Manager> userFateStore = new UserFateStore<>(ctx);
+ FateStore<Manager> metaFateStore =
+ new MetaFateStore<>(ctx.getZooKeeperRoot() + Constants.ZFATE,
ctx.getZooReaderWriter());
SortedSet<Text> splits = new TreeSet<>();
splits.add(new Text(row(MAX_DATA / 2)));
@@ -314,7 +314,7 @@ public class ExternalCompaction_1_IT extends
SharedMiniClusterBase {
AccumuloTable.METADATA.tableName(), userTable)) {
var tableId = ctx.getTableId(tableName);
var fateStore = FateInstanceType.fromTableId(tableId) ==
FateInstanceType.USER
- ? accumuloStore : zkStore;
+ ? userFateStore : metaFateStore;
fateIds.put(tableId,
createCompactionCommitAndDeadMetadata(c, fateStore, tableName,
allCids));
}
@@ -324,7 +324,7 @@ public class ExternalCompaction_1_IT extends
SharedMiniClusterBase {
for (Entry<TableId,FateId> entry : fateIds.entrySet()) {
var tableId = entry.getKey();
var fateStore = FateInstanceType.fromTableId(tableId) ==
FateInstanceType.USER
- ? accumuloStore : zkStore;
+ ? userFateStore : metaFateStore;
verifyCompactionCommitAndDead(fateStore, tableId, entry.getValue(),
allCids.get(tableId));
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/FateStoreIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/FateStoreIT.java
similarity index 99%
rename from
test/src/main/java/org/apache/accumulo/test/fate/accumulo/FateStoreIT.java
rename to test/src/main/java/org/apache/accumulo/test/fate/FateStoreIT.java
index 582e18fb59..474410e043 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/FateStoreIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FateStoreIT.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.test.fate.accumulo;
+package org.apache.accumulo.test.fate;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -59,7 +59,6 @@ import
org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.test.fate.FateIT.TestRepo;
-import org.apache.accumulo.test.fate.FateTestRunner;
import org.apache.accumulo.test.fate.FateTestRunner.TestEnv;
import org.apache.accumulo.test.util.Wait;
import org.apache.hadoop.io.Text;
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZookeeperFateIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateIT.java
similarity index 89%
rename from
test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZookeeperFateIT.java
rename to test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateIT.java
index f66f226781..b9e8c10127 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZookeeperFateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateIT.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.test.fate.zookeeper;
+package org.apache.accumulo.test.fate.meta;
import static
org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER;
import static org.easymock.EasyMock.createMock;
@@ -31,8 +31,8 @@ import java.util.UUID;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.fate.AbstractFateStore.FateIdGenerator;
import org.apache.accumulo.core.fate.FateId;
+import org.apache.accumulo.core.fate.MetaFateStore;
import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus;
-import org.apache.accumulo.core.fate.ZooStore;
import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.test.fate.FateIT;
@@ -45,7 +45,7 @@ import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.io.TempDir;
@Tag(ZOOKEEPER_TESTING_SERVER)
-public class ZookeeperFateIT extends FateIT {
+public class MetaFateIT extends FateIT {
private static ZooKeeperTestingServer szk = null;
private static ZooReaderWriter zk = null;
@@ -75,8 +75,8 @@ public class ZookeeperFateIT extends FateIT {
expect(sctx.getZooReaderWriter()).andReturn(zk).anyTimes();
replay(sctx);
- testMethod.execute(new ZooStore<>(ZK_ROOT + Constants.ZFATE, zk,
maxDeferred, fateIdGenerator),
- sctx);
+ testMethod.execute(
+ new MetaFateStore<>(ZK_ROOT + Constants.ZFATE, zk, maxDeferred,
fateIdGenerator), sctx);
}
@Override
@@ -89,8 +89,8 @@ public class ZookeeperFateIT extends FateIT {
}
/*
- * Get the status of the TX from ZK directly. Unable to call
ZooStore.getStatus because this test
- * thread does not have the reservation (the FaTE thread does)
+ * Get the status of the TX from ZK directly. Unable to call
MetaFateStore.getStatus because this
+ * test thread does not have the reservation (the FaTE thread does)
*/
private static TStatus getTxStatus(ZooReaderWriter zrw, FateId fateId)
throws KeeperException, InterruptedException {
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZookeeperFateOpsCommandsIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateOpsCommandsIT.java
similarity index 86%
rename from
test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZookeeperFateOpsCommandsIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateOpsCommandsIT.java
index eed1bb244d..5dc1daf9b2 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZookeeperFateOpsCommandsIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateOpsCommandsIT.java
@@ -16,22 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.test.fate.zookeeper;
+package org.apache.accumulo.test.fate.meta;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.fate.AbstractFateStore;
-import org.apache.accumulo.core.fate.ZooStore;
+import org.apache.accumulo.core.fate.MetaFateStore;
import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.test.fate.FateOpsCommandsIT;
-public class ZookeeperFateOpsCommandsIT extends FateOpsCommandsIT {
+public class MetaFateOpsCommandsIT extends FateOpsCommandsIT {
@Override
public void executeTest(FateTestExecutor<TestEnv> testMethod, int
maxDeferred,
AbstractFateStore.FateIdGenerator fateIdGenerator) throws Exception {
ServerContext sctx = getCluster().getServerContext();
String path = sctx.getZooKeeperRoot() + Constants.ZFATE;
ZooReaderWriter zk = sctx.getZooReaderWriter();
- testMethod.execute(new ZooStore<>(path, zk), sctx);
+ testMethod.execute(new MetaFateStore<>(path, zk), sctx);
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZooStoreFateIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStoreFateIT.java
similarity index 91%
rename from
test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZooStoreFateIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStoreFateIT.java
index 1b99cdb8a5..ab9885b385 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZooStoreFateIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStoreFateIT.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.test.fate.zookeeper;
+package org.apache.accumulo.test.fate.meta;
import static
org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER;
import static org.easymock.EasyMock.createMock;
@@ -32,12 +32,12 @@ import java.util.UUID;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.fate.AbstractFateStore.FateIdGenerator;
import org.apache.accumulo.core.fate.FateId;
+import org.apache.accumulo.core.fate.MetaFateStore;
import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus;
-import org.apache.accumulo.core.fate.ZooStore;
import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
import org.apache.accumulo.server.ServerContext;
-import org.apache.accumulo.test.fate.accumulo.FateStoreIT;
+import org.apache.accumulo.test.fate.FateStoreIT;
import org.apache.accumulo.test.zookeeper.ZooKeeperTestingServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -45,7 +45,7 @@ import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.io.TempDir;
@Tag(ZOOKEEPER_TESTING_SERVER)
-public class ZooStoreFateIT extends FateStoreIT {
+public class MetaFateStoreFateIT extends FateStoreIT {
private static ZooKeeperTestingServer szk = null;
private static ZooReaderWriter zk = null;
@@ -75,8 +75,8 @@ public class ZooStoreFateIT extends FateStoreIT {
expect(sctx.getZooReaderWriter()).andReturn(zk).anyTimes();
replay(sctx);
- testMethod.execute(new ZooStore<>(ZK_ROOT + Constants.ZFATE, zk,
maxDeferred, fateIdGenerator),
- sctx);
+ testMethod.execute(
+ new MetaFateStore<>(ZK_ROOT + Constants.ZFATE, zk, maxDeferred,
fateIdGenerator), sctx);
}
@Override
@@ -85,7 +85,7 @@ public class ZooStoreFateIT extends FateStoreIT {
// We have to use reflection since the NodeValue is internal to the store
// Grab both the constructor that uses the serialized bytes and status
- Class<?> nodeClass = Class.forName(ZooStore.class.getName() +
"$NodeValue");
+ Class<?> nodeClass = Class.forName(MetaFateStore.class.getName() +
"$NodeValue");
Constructor<?> statusCons =
nodeClass.getDeclaredConstructor(TStatus.class);
Constructor<?> serializedCons =
nodeClass.getDeclaredConstructor(byte[].class);
statusCons.setAccessible(true);
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZooMutatorIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/meta/ZooMutatorIT.java
similarity index 99%
rename from
test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZooMutatorIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/meta/ZooMutatorIT.java
index 639c52e02c..efe99ab17e 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZooMutatorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/meta/ZooMutatorIT.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.test.fate.zookeeper;
+package org.apache.accumulo.test.fate.meta;
import static java.nio.charset.StandardCharsets.UTF_8;
import static
org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER;
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/FateMutatorImplIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT.java
similarity index 96%
rename from
test/src/main/java/org/apache/accumulo/test/fate/accumulo/FateMutatorImplIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT.java
index a9410df845..aaa9be01f1 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/FateMutatorImplIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.test.fate.accumulo;
+package org.apache.accumulo.test.fate.user;
-import static
org.apache.accumulo.core.fate.accumulo.FateMutator.Status.ACCEPTED;
-import static
org.apache.accumulo.core.fate.accumulo.FateMutator.Status.REJECTED;
+import static org.apache.accumulo.core.fate.user.FateMutator.Status.ACCEPTED;
+import static org.apache.accumulo.core.fate.user.FateMutator.Status.REJECTED;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -34,7 +34,7 @@ import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.FateInstanceType;
import org.apache.accumulo.core.fate.ReadOnlyFateStore;
-import org.apache.accumulo.core.fate.accumulo.FateMutatorImpl;
+import org.apache.accumulo.core.fate.user.FateMutatorImpl;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.fate.FateIT;
import org.junit.jupiter.api.AfterAll;
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloFateIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
similarity index 88%
rename from
test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloFateIT.java
rename to test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
index e4a944c41f..6ecbc0b5a5 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloFateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.test.fate.accumulo;
+package org.apache.accumulo.test.fate.user;
-import static
org.apache.accumulo.test.fate.accumulo.AccumuloStoreIT.createFateTable;
+import static
org.apache.accumulo.test.fate.user.UserFateStoreIT.createFateTable;
import java.util.stream.StreamSupport;
@@ -30,8 +30,8 @@ import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.fate.AbstractFateStore.FateIdGenerator;
import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus;
-import org.apache.accumulo.core.fate.accumulo.AccumuloStore;
-import org.apache.accumulo.core.fate.accumulo.schema.FateSchema.TxColumnFamily;
+import org.apache.accumulo.core.fate.user.UserFateStore;
+import org.apache.accumulo.core.fate.user.schema.FateSchema.TxColumnFamily;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
@@ -39,7 +39,7 @@ import org.apache.accumulo.test.fate.FateIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-public class AccumuloFateIT extends FateIT {
+public class UserFateIT extends FateIT {
private String table;
@@ -60,7 +60,7 @@ public class AccumuloFateIT extends FateIT {
try (ClientContext client =
(ClientContext) Accumulo.newClient().from(getClientProps()).build()) {
createFateTable(client, table);
- testMethod.execute(new AccumuloStore<>(client, table, maxDeferred,
fateIdGenerator),
+ testMethod.execute(new UserFateStore<>(client, table, maxDeferred,
fateIdGenerator),
getCluster().getServerContext());
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloFateOpsCommandsIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateOpsCommandsIT.java
similarity index 82%
rename from
test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloFateOpsCommandsIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/user/UserFateOpsCommandsIT.java
index 3ec774350b..fde93de346 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloFateOpsCommandsIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateOpsCommandsIT.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.test.fate.accumulo;
+package org.apache.accumulo.test.fate.user;
import org.apache.accumulo.core.fate.AbstractFateStore;
-import org.apache.accumulo.core.fate.accumulo.AccumuloStore;
+import org.apache.accumulo.core.fate.user.UserFateStore;
import org.apache.accumulo.test.fate.FateOpsCommandsIT;
-public class AccumuloFateOpsCommandsIT extends FateOpsCommandsIT {
+public class UserFateOpsCommandsIT extends FateOpsCommandsIT {
@Override
public void executeTest(FateTestExecutor<TestEnv> testMethod, int
maxDeferred,
AbstractFateStore.FateIdGenerator fateIdGenerator) throws Exception {
- testMethod.execute(new AccumuloStore<>(getCluster().getServerContext()),
+ testMethod.execute(new UserFateStore<>(getCluster().getServerContext()),
getCluster().getServerContext());
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloStoreFateIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
similarity index 83%
rename from
test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloStoreFateIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
index 11bdf48e15..2a3248f767 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloStoreFateIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.test.fate.accumulo;
+package org.apache.accumulo.test.fate.user;
-import static org.apache.accumulo.core.fate.accumulo.AccumuloStore.getRowId;
-import static
org.apache.accumulo.test.fate.accumulo.AccumuloStoreIT.createFateTable;
+import static org.apache.accumulo.core.fate.user.UserFateStore.getRowId;
+import static
org.apache.accumulo.test.fate.user.UserFateStoreIT.createFateTable;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.BatchWriter;
@@ -29,14 +29,15 @@ import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.fate.AbstractFateStore.FateIdGenerator;
import org.apache.accumulo.core.fate.FateId;
-import org.apache.accumulo.core.fate.accumulo.AccumuloStore;
-import org.apache.accumulo.core.fate.accumulo.schema.FateSchema.TxColumnFamily;
+import org.apache.accumulo.core.fate.user.UserFateStore;
+import org.apache.accumulo.core.fate.user.schema.FateSchema.TxColumnFamily;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
+import org.apache.accumulo.test.fate.FateStoreIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-public class AccumuloStoreFateIT extends FateStoreIT {
+public class UserFateStoreFateIT extends FateStoreIT {
@BeforeAll
public static void setup() throws Exception {
@@ -55,7 +56,7 @@ public class AccumuloStoreFateIT extends FateStoreIT {
try (ClientContext client =
(ClientContext) Accumulo.newClient().from(getClientProps()).build()) {
createFateTable(client, table);
- testMethod.execute(new AccumuloStore<>(client, table, maxDeferred,
fateIdGenerator),
+ testMethod.execute(new UserFateStore<>(client, table, maxDeferred,
fateIdGenerator),
getCluster().getServerContext());
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloStoreIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreIT.java
similarity index 94%
rename from
test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloStoreIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreIT.java
index 0430abfc01..8d286e9d2b 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloStoreIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreIT.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.test.fate.accumulo;
+package org.apache.accumulo.test.fate.user;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -46,12 +46,13 @@ import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.FateInstanceType;
import org.apache.accumulo.core.fate.FateStore;
import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus;
-import org.apache.accumulo.core.fate.accumulo.AccumuloStore;
-import org.apache.accumulo.core.fate.accumulo.schema.FateSchema;
+import org.apache.accumulo.core.fate.user.UserFateStore;
+import org.apache.accumulo.core.fate.user.schema.FateSchema;
import org.apache.accumulo.core.iterators.user.VersioningIterator;
import org.apache.accumulo.core.metadata.AccumuloTable;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.fate.FateIT;
+import org.apache.accumulo.test.fate.FateTestRunner.TestEnv;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
@@ -65,9 +66,9 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.MoreCollectors;
-public class AccumuloStoreIT extends SharedMiniClusterBase {
+public class UserFateStoreIT extends SharedMiniClusterBase {
- private static final Logger log =
LoggerFactory.getLogger(AccumuloStore.class);
+ private static final Logger log =
LoggerFactory.getLogger(UserFateStore.class);
private static final FateInstanceType fateInstanceType =
FateInstanceType.USER;
@BeforeAll
@@ -80,11 +81,11 @@ public class AccumuloStoreIT extends SharedMiniClusterBase {
SharedMiniClusterBase.stopMiniCluster();
}
- private static class TestAccumuloStore extends AccumuloStore<FateIT.TestEnv>
{
+ private static class TestUserFateStore extends UserFateStore<TestEnv> {
private final Iterator<FateId> fateIdIterator;
// use the list of fateIds to simulate collisions on fateIds
- public TestAccumuloStore(ClientContext context, String tableName,
List<FateId> fateIds) {
+ public TestUserFateStore(ClientContext context, String tableName,
List<FateId> fateIds) {
super(context, tableName);
this.fateIdIterator = fateIds.iterator();
}
@@ -166,7 +167,7 @@ public class AccumuloStoreIT extends SharedMiniClusterBase {
List<FateId> fateIds = txids.stream().map(txid ->
FateId.from(fateInstanceType, txid))
.collect(Collectors.toList());
Set<FateId> expectedFateIds = new LinkedHashSet<>(fateIds);
- TestAccumuloStore store = new TestAccumuloStore(client, table, fateIds);
+ TestUserFateStore store = new TestUserFateStore(client, table, fateIds);
// call create and expect we get the unique txids
for (FateId expectedFateId : expectedFateIds) {
@@ -186,7 +187,7 @@ public class AccumuloStoreIT extends SharedMiniClusterBase {
String tableName;
ClientContext client;
FateId fateId;
- TestAccumuloStore store;
+ TestUserFateStore store;
FateStore.FateTxStore<FateIT.TestEnv> txStore;
@BeforeEach
@@ -195,7 +196,7 @@ public class AccumuloStoreIT extends SharedMiniClusterBase {
tableName = getUniqueNames(1)[0];
createFateTable(client, tableName);
fateId = FateId.from(fateInstanceType, UUID.randomUUID());
- store = new TestAccumuloStore(client, tableName, List.of(fateId));
+ store = new TestUserFateStore(client, tableName, List.of(fateId));
store.create();
txStore = store.reserve(fateId);
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java
index 85c2e3cfb2..5f05b0b64e 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java
@@ -50,9 +50,9 @@ import org.apache.accumulo.core.data.InstanceId;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.fate.AdminUtil;
import org.apache.accumulo.core.fate.FateInstanceType;
+import org.apache.accumulo.core.fate.MetaFateStore;
import org.apache.accumulo.core.fate.ReadOnlyFateStore;
-import org.apache.accumulo.core.fate.ZooStore;
-import org.apache.accumulo.core.fate.accumulo.AccumuloStore;
+import org.apache.accumulo.core.fate.user.UserFateStore;
import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
import org.apache.accumulo.core.lock.ServiceLock;
@@ -262,12 +262,13 @@ public class FateConcurrencyIT extends
AccumuloClusterHarness {
InstanceId instanceId = context.getInstanceID();
ZooReaderWriter zk = context.getZooReader().asWriter(secret);
- ZooStore<String> zs = new ZooStore<>(ZooUtil.getRoot(instanceId) +
Constants.ZFATE, zk);
+ MetaFateStore<String> zs =
+ new MetaFateStore<>(ZooUtil.getRoot(instanceId) + Constants.ZFATE,
zk);
var lockPath =
ServiceLock.path(ZooUtil.getRoot(instanceId) +
Constants.ZTABLE_LOCKS + "/" + tableId);
- AccumuloStore<String> as = new AccumuloStore<>(context);
+ UserFateStore<String> ufs = new UserFateStore<>(context);
Map<FateInstanceType,ReadOnlyFateStore<String>> fateStores =
- Map.of(FateInstanceType.META, zs, FateInstanceType.USER, as);
+ Map.of(FateInstanceType.META, zs, FateInstanceType.USER, ufs);
withLocks = admin.getStatus(fateStores, zk, lockPath, null, null,
null);
@@ -355,7 +356,8 @@ public class FateConcurrencyIT extends
AccumuloClusterHarness {
InstanceId instanceId = context.getInstanceID();
ZooReaderWriter zk = context.getZooReader().asWriter(secret);
- ZooStore<String> zs = new ZooStore<>(ZooUtil.getRoot(instanceId) +
Constants.ZFATE, zk);
+ MetaFateStore<String> zs =
+ new MetaFateStore<>(ZooUtil.getRoot(instanceId) + Constants.ZFATE,
zk);
var lockPath =
ServiceLock.path(ZooUtil.getRoot(instanceId) +
Constants.ZTABLE_LOCKS + "/" + tableId);
AdminUtil.FateStatus fateStatus = admin.getStatus(zs, zk, lockPath,
null, null, null);
@@ -385,7 +387,7 @@ public class FateConcurrencyIT extends
AccumuloClusterHarness {
log.trace("tid: {}", tableId);
- AccumuloStore<String> as = new AccumuloStore<>(context);
+ UserFateStore<String> as = new UserFateStore<>(context);
AdminUtil.FateStatus fateStatus = admin.getStatus(as, null, null, null);
log.trace("current fates: {}", fateStatus.getTransactions().size());
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
index 7d4caa1202..6d80cf5be0 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
@@ -60,7 +60,7 @@ import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.fate.AdminUtil;
import org.apache.accumulo.core.fate.AdminUtil.FateStatus;
-import org.apache.accumulo.core.fate.ZooStore;
+import org.apache.accumulo.core.fate.MetaFateStore;
import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.core.lock.ServiceLock;
import org.apache.accumulo.core.metadata.AccumuloTable;
@@ -231,7 +231,8 @@ public class FunctionalTestUtils {
AdminUtil<String> admin = new AdminUtil<>(false);
ServerContext context = cluster.getServerContext();
ZooReaderWriter zk = context.getZooReaderWriter();
- ZooStore<String> zs = new ZooStore<>(context.getZooKeeperRoot() +
Constants.ZFATE, zk);
+ MetaFateStore<String> zs =
+ new MetaFateStore<>(context.getZooKeeperRoot() + Constants.ZFATE,
zk);
var lockPath = ServiceLock.path(context.getZooKeeperRoot() +
Constants.ZTABLE_LOCKS);
return admin.getStatus(zs, zk, lockPath, null, null, null);
} catch (KeeperException | InterruptedException e) {
