This is an automated email from the ASF dual-hosted git repository.
mmiller 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 e08287065d Rename ZooStore methods and change Strings to enum (#2842)
e08287065d is described below
commit e08287065d3af4773dd97a3991686abc3002f6dd
Author: Christopher L. Shannon <christopher.l.shan...@gmail.com>
AuthorDate: Fri Aug 12 15:53:19 2022 -0400
Rename ZooStore methods and change Strings to enum (#2842)
* This closes #2841
---
.../apache/accumulo/core/logging/FateLogger.java | 11 +++++-----
.../java/org/apache/accumulo/fate/AdminUtil.java | 24 +++++++++++----------
.../java/org/apache/accumulo/fate/AgeOffStore.java | 8 +++----
.../main/java/org/apache/accumulo/fate/Fate.java | 25 +++++++++++-----------
.../org/apache/accumulo/fate/ReadOnlyRepo.java | 2 +-
.../org/apache/accumulo/fate/ReadOnlyStore.java | 8 +++----
.../org/apache/accumulo/fate/ReadOnlyTStore.java | 8 +++----
.../main/java/org/apache/accumulo/fate/TStore.java | 12 ++++++++++-
.../java/org/apache/accumulo/fate/ZooStore.java | 12 +++++------
.../apache/accumulo/fate/ReadOnlyStoreTest.java | 9 ++++----
.../manager/metrics/fate/FateMetricValues.java | 2 +-
.../accumulo/manager/tableOps/ManagerRepo.java | 2 +-
.../accumulo/manager/tableOps/TraceRepo.java | 10 ++++-----
.../commands/fateCommand/FateSummaryReport.java | 2 +-
.../shell/commands/fateCommand/FateTxnDetails.java | 4 ++--
.../commands/fateCommand/SummaryReportTest.java | 2 +-
.../shell/commands/fateCommand/TxnDetailsTest.java | 6 +++---
.../test/functional/FateConcurrencyIT.java | 4 ++--
18 files changed, 82 insertions(+), 69 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/logging/FateLogger.java
b/core/src/main/java/org/apache/accumulo/core/logging/FateLogger.java
index 2b913d59aa..56a9790205 100644
--- a/core/src/main/java/org/apache/accumulo/core/logging/FateLogger.java
+++ b/core/src/main/java/org/apache/accumulo/core/logging/FateLogger.java
@@ -25,6 +25,7 @@ import java.util.EnumSet;
import java.util.List;
import java.util.function.Function;
+import org.apache.accumulo.fate.Fate;
import org.apache.accumulo.fate.ReadOnlyRepo;
import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.fate.StackOverflowException;
@@ -80,8 +81,8 @@ public class FateLogger {
}
@Override
- public Serializable getProperty(long tid, String prop) {
- return store.getProperty(tid, prop);
+ public Serializable getTransactionInfo(long tid, Fate.TxInfo txInfo) {
+ return store.getTransactionInfo(tid, txInfo);
}
@Override
@@ -129,10 +130,10 @@ public class FateLogger {
}
@Override
- public void setProperty(long tid, String prop, Serializable val) {
- store.setProperty(tid, prop, val);
+ public void setTransactionInfo(long tid, Fate.TxInfo txInfo,
Serializable val) {
+ store.setTransactionInfo(tid, txInfo, val);
if (storeLog.isTraceEnabled())
- storeLog.trace("{} setting {} node data to {}", formatTid(tid),
prop, val);
+ storeLog.trace("{} setting {} txInfo to {}", formatTid(tid), txInfo,
val);
}
@Override
diff --git a/core/src/main/java/org/apache/accumulo/fate/AdminUtil.java
b/core/src/main/java/org/apache/accumulo/fate/AdminUtil.java
index bf1ceef4e6..dbe1fa5def 100644
--- a/core/src/main/java/org/apache/accumulo/fate/AdminUtil.java
+++ b/core/src/main/java/org/apache/accumulo/fate/AdminUtil.java
@@ -73,18 +73,18 @@ public class AdminUtil<T> {
private final long txid;
private final TStatus status;
- private final String debug;
+ private final String repoTarget;
private final List<String> hlocks;
private final List<String> wlocks;
private final String top;
private final long timeCreated;
- private TransactionStatus(Long tid, TStatus status, String debug,
List<String> hlocks,
+ private TransactionStatus(Long tid, TStatus status, String repoTarget,
List<String> hlocks,
List<String> wlocks, String top, Long timeCreated) {
this.txid = tid;
this.status = status;
- this.debug = debug;
+ this.repoTarget = repoTarget;
this.hlocks = Collections.unmodifiableList(hlocks);
this.wlocks = Collections.unmodifiableList(wlocks);
this.top = top;
@@ -105,10 +105,10 @@ public class AdminUtil<T> {
}
/**
- * @return The debug info for the operation on the top of the stack for
this Fate operation.
+ * @return The repo target for the operation on the top of the stack for
this Fate operation.
*/
- public String getDebug() {
- return debug;
+ public String getRepoTarget() {
+ return repoTarget;
}
/**
@@ -364,7 +364,7 @@ public class AdminUtil<T> {
zs.reserve(tid);
- String debug = (String) zs.getProperty(tid, Fate.DEBUG_PROP);
+ String repoTarget = (String) zs.getTransactionInfo(tid,
Fate.TxInfo.REPO_TARGET);
List<String> hlocks = heldLocks.remove(tid);
@@ -381,7 +381,7 @@ public class AdminUtil<T> {
String top = null;
ReadOnlyRepo<T> repo = zs.top(tid);
if (repo != null)
- top = repo.getDescription();
+ top = repo.getName();
TStatus status = zs.getStatus(tid);
@@ -390,7 +390,8 @@ public class AdminUtil<T> {
zs.unreserve(tid, 0);
if (includeByStatus(status, filterStatus) && includeByTxid(tid,
filterTxid)) {
- statuses.add(new TransactionStatus(tid, status, debug, hlocks, wlocks,
top, timeCreated));
+ statuses
+ .add(new TransactionStatus(tid, status, repoTarget, hlocks,
wlocks, top, timeCreated));
}
}
@@ -419,8 +420,9 @@ public class AdminUtil<T> {
for (TransactionStatus txStatus : fateStatus.getTransactions()) {
fmt.format(
"txid: %s status: %-18s op: %-15s locked: %-15s locking: %-15s
top: %-15s created: %s%n",
- txStatus.getTxid(), txStatus.getStatus(), txStatus.getDebug(),
txStatus.getHeldLocks(),
- txStatus.getWaitingLocks(), txStatus.getTop(),
txStatus.getTimeCreatedFormatted());
+ txStatus.getTxid(), txStatus.getStatus(), txStatus.getRepoTarget(),
+ txStatus.getHeldLocks(), txStatus.getWaitingLocks(),
txStatus.getTop(),
+ txStatus.getTimeCreatedFormatted());
}
fmt.format(" %s transactions", fateStatus.getTransactions().size());
diff --git a/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
b/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
index 5f3c746ecc..c3401a4901 100644
--- a/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
+++ b/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
@@ -212,13 +212,13 @@ public class AgeOffStore<T> implements TStore<T> {
}
@Override
- public void setProperty(long tid, String prop, Serializable val) {
- store.setProperty(tid, prop, val);
+ public void setTransactionInfo(long tid, Fate.TxInfo txInfo, Serializable
val) {
+ store.setTransactionInfo(tid, txInfo, val);
}
@Override
- public Serializable getProperty(long tid, String prop) {
- return store.getProperty(tid, prop);
+ public Serializable getTransactionInfo(long tid, Fate.TxInfo txInfo) {
+ return store.getTransactionInfo(tid, txInfo);
}
@Override
diff --git a/core/src/main/java/org/apache/accumulo/fate/Fate.java
b/core/src/main/java/org/apache/accumulo/fate/Fate.java
index 13c9dc03f3..30ab7fd3c8 100644
--- a/core/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/core/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -54,11 +54,6 @@ import org.slf4j.LoggerFactory;
*/
public class Fate<T> {
- public static final String DEBUG_PROP = "prop_debug";
- private static final String AUTO_CLEAN_PROP = "prop_autoClean";
- private static final String EXCEPTION_PROP = "prop_exception";
- private static final String RETURN_PROP = "prop_return";
-
private static final Logger log = LoggerFactory.getLogger(Fate.class);
private final Logger runnerLog =
LoggerFactory.getLogger(TransactionRunner.class);
@@ -71,6 +66,10 @@ public class Fate<T> {
private final AtomicBoolean keepRunning = new AtomicBoolean(true);
+ public enum TxInfo {
+ REPO_TARGET, AUTO_CLEAN, EXCEPTION, RETURN_VALUE
+ }
+
private class TransactionRunner implements Runnable {
@Override
@@ -111,7 +110,7 @@ public class Fate<T> {
// transaction is finished
String ret = prevOp.getReturn();
if (ret != null)
- store.setProperty(tid, RETURN_PROP, ret);
+ store.setTransactionInfo(tid, TxInfo.RETURN_VALUE, ret);
store.setStatus(tid, SUCCESSFUL);
doCleanUp(tid);
} else {
@@ -190,7 +189,7 @@ public class Fate<T> {
} else {
log.warn(msg, e);
}
- store.setProperty(tid, EXCEPTION_PROP, e);
+ store.setTransactionInfo(tid, TxInfo.EXCEPTION, e);
store.setStatus(tid, FAILED_IN_PROGRESS);
log.info("Updated status for Repo with {} to FAILED_IN_PROGRESS",
tidStr);
}
@@ -208,7 +207,7 @@ public class Fate<T> {
}
private void doCleanUp(long tid) {
- Boolean autoClean = (Boolean) store.getProperty(tid, AUTO_CLEAN_PROP);
+ Boolean autoClean = (Boolean) store.getTransactionInfo(tid,
TxInfo.AUTO_CLEAN);
if (autoClean != null && autoClean) {
store.delete(tid);
} else {
@@ -299,9 +298,9 @@ public class Fate<T> {
}
if (autoCleanUp)
- store.setProperty(tid, AUTO_CLEAN_PROP, autoCleanUp);
+ store.setTransactionInfo(tid, TxInfo.AUTO_CLEAN, autoCleanUp);
- store.setProperty(tid, DEBUG_PROP, repo.getDescription());
+ store.setTransactionInfo(tid, TxInfo.REPO_TARGET, repo.getName());
store.setStatus(tid, SUBMITTED);
}
@@ -332,7 +331,7 @@ public class Fate<T> {
TStatus status = store.getStatus(tid);
log.info("status is: {}", status);
if (status == NEW || status == SUBMITTED) {
- store.setProperty(tid, EXCEPTION_PROP, new TApplicationException(
+ store.setTransactionInfo(tid, TxInfo.EXCEPTION, new
TApplicationException(
TApplicationException.INTERNAL_ERROR, "Fate transaction
cancelled by user"));
store.setStatus(tid, FAILED_IN_PROGRESS);
log.info("Updated status for {} to FAILED_IN_PROGRESS because it
was cancelled by user",
@@ -384,7 +383,7 @@ public class Fate<T> {
if (store.getStatus(tid) != SUCCESSFUL)
throw new IllegalStateException("Tried to get exception when
transaction "
+ FateTxId.formatTid(tid) + " not in successful state");
- return (String) store.getProperty(tid, RETURN_PROP);
+ return (String) store.getTransactionInfo(tid, TxInfo.RETURN_VALUE);
} finally {
store.unreserve(tid, 0);
}
@@ -397,7 +396,7 @@ public class Fate<T> {
if (store.getStatus(tid) != FAILED)
throw new IllegalStateException("Tried to get exception when
transaction "
+ FateTxId.formatTid(tid) + " not in failed state");
- return (Exception) store.getProperty(tid, EXCEPTION_PROP);
+ return (Exception) store.getTransactionInfo(tid, TxInfo.EXCEPTION);
} finally {
store.unreserve(tid, 0);
}
diff --git a/core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java
b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java
index 6de2837cb4..511b2166bf 100644
--- a/core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java
+++ b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java
@@ -28,6 +28,6 @@ public interface ReadOnlyRepo<T> {
long isReady(long tid, T environment) throws Exception;
- String getDescription();
+ String getName();
}
diff --git a/core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
index 3392079b73..e0d028d892 100644
--- a/core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
+++ b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
@@ -82,8 +82,8 @@ public class ReadOnlyStore<T> implements ReadOnlyTStore<T> {
}
@Override
- public String getDescription() {
- return repo.getDescription();
+ public String getName() {
+ return repo.getName();
}
}
@@ -103,8 +103,8 @@ public class ReadOnlyStore<T> implements ReadOnlyTStore<T> {
}
@Override
- public Serializable getProperty(long tid, String prop) {
- return store.getProperty(tid, prop);
+ public Serializable getTransactionInfo(long tid, Fate.TxInfo txInfo) {
+ return store.getTransactionInfo(tid, txInfo);
}
@Override
diff --git a/core/src/main/java/org/apache/accumulo/fate/ReadOnlyTStore.java
b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyTStore.java
index a78379dd3c..ccb939ccdd 100644
--- a/core/src/main/java/org/apache/accumulo/fate/ReadOnlyTStore.java
+++ b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyTStore.java
@@ -123,16 +123,16 @@ public interface ReadOnlyTStore<T> {
TStatus waitForStatusChange(long tid, EnumSet<TStatus> expected);
/**
- * Retrieve a transaction-specific property.
+ * Retrieve transaction-specific information.
*
* Caller must have already reserved tid.
*
* @param tid
* transaction id, previously reserved.
- * @param prop
- * name of property to retrieve.
+ * @param txInfo
+ * name of attribute of a transaction to retrieve.
*/
- Serializable getProperty(long tid, String prop);
+ Serializable getTransactionInfo(long tid, Fate.TxInfo txInfo);
/**
* list all transaction ids in store.
diff --git a/core/src/main/java/org/apache/accumulo/fate/TStore.java
b/core/src/main/java/org/apache/accumulo/fate/TStore.java
index c883423177..400242b2e3 100644
--- a/core/src/main/java/org/apache/accumulo/fate/TStore.java
+++ b/core/src/main/java/org/apache/accumulo/fate/TStore.java
@@ -65,7 +65,17 @@ public interface TStore<T> extends ReadOnlyTStore<T> {
*/
void setStatus(long tid, TStatus status);
- void setProperty(long tid, String prop, Serializable val);
+ /**
+ * Set transaction-specific information.
+ *
+ * @param tid
+ * transaction id
+ * @param txInfo
+ * name of attribute of a transaction to set.
+ * @param val
+ * transaction data to store
+ */
+ void setTransactionInfo(long tid, Fate.TxInfo txInfo, Serializable val);
/**
* Remove the transaction from the store.
diff --git a/core/src/main/java/org/apache/accumulo/fate/ZooStore.java
b/core/src/main/java/org/apache/accumulo/fate/ZooStore.java
index d78ff8306c..1e5e955f36 100644
--- a/core/src/main/java/org/apache/accumulo/fate/ZooStore.java
+++ b/core/src/main/java/org/apache/accumulo/fate/ZooStore.java
@@ -446,12 +446,12 @@ public class ZooStore<T> implements TStore<T> {
}
@Override
- public void setProperty(long tid, String prop, Serializable so) {
+ public void setTransactionInfo(long tid, Fate.TxInfo txInfo, Serializable
so) {
verifyReserved(tid);
try {
if (so instanceof String) {
- zk.putPersistentData(getTXPath(tid) + "/" + prop, ("S " +
so).getBytes(UTF_8),
+ zk.putPersistentData(getTXPath(tid) + "/" + txInfo, ("S " +
so).getBytes(UTF_8),
NodeExistsPolicy.OVERWRITE);
} else {
byte[] sera = serialize(so);
@@ -459,7 +459,7 @@ public class ZooStore<T> implements TStore<T> {
System.arraycopy(sera, 0, data, 2, sera.length);
data[0] = 'O';
data[1] = ' ';
- zk.putPersistentData(getTXPath(tid) + "/" + prop, data,
NodeExistsPolicy.OVERWRITE);
+ zk.putPersistentData(getTXPath(tid) + "/" + txInfo, data,
NodeExistsPolicy.OVERWRITE);
}
} catch (Exception e2) {
throw new RuntimeException(e2);
@@ -467,11 +467,11 @@ public class ZooStore<T> implements TStore<T> {
}
@Override
- public Serializable getProperty(long tid, String prop) {
+ public Serializable getTransactionInfo(long tid, Fate.TxInfo txInfo) {
verifyReserved(tid);
try {
- byte[] data = zk.getData(getTXPath(tid) + "/" + prop);
+ byte[] data = zk.getData(getTXPath(tid) + "/" + txInfo);
if (data[0] == 'O') {
byte[] sera = new byte[data.length - 2];
@@ -480,7 +480,7 @@ public class ZooStore<T> implements TStore<T> {
} else if (data[0] == 'S') {
return new String(data, 2, data.length - 2, UTF_8);
} else {
- throw new IllegalStateException("Bad property data " + prop);
+ throw new IllegalStateException("Bad node data " + txInfo);
}
} catch (NoNodeException nne) {
return null;
diff --git a/core/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
b/core/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
index 73be8bfcd7..9c4a85134d 100644
--- a/core/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
+++ b/core/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
@@ -36,7 +36,7 @@ public class ReadOnlyStoreTest {
@Test
public void everythingPassesThrough() throws Exception {
Repo<String> repo = EasyMock.createMock(Repo.class);
- EasyMock.expect(repo.getDescription()).andReturn("description");
+ EasyMock.expect(repo.getName()).andReturn("description");
EasyMock.expect(repo.isReady(0xdeadbeefL, null)).andReturn(0x0L);
ZooStore<String> mock = EasyMock.createNiceMock(ZooStore.class);
@@ -48,7 +48,8 @@ public class ReadOnlyStoreTest {
EasyMock.expect(mock.waitForStatusChange(0xdeadbeefL,
EnumSet.allOf(TStatus.class)))
.andReturn(TStatus.UNKNOWN);
- EasyMock.expect(mock.getProperty(0xdeadbeefL,
"com.example.anyproperty")).andReturn("property");
+ EasyMock.expect(mock.getTransactionInfo(0xdeadbeefL,
Fate.TxInfo.RETURN_VALUE))
+ .andReturn("txInfo");
EasyMock.expect(mock.list()).andReturn(Collections.emptyList());
EasyMock.replay(repo);
@@ -59,14 +60,14 @@ public class ReadOnlyStoreTest {
store.reserve(0xdeadbeefL);
ReadOnlyRepo<String> top = store.top(0xdeadbeefL);
assertFalse(top instanceof Repo);
- assertEquals("description", top.getDescription());
+ assertEquals("description", top.getName());
assertEquals(0x0L, top.isReady(0xdeadbeefL, null));
assertEquals(TStatus.UNKNOWN, store.getStatus(0xdeadbeefL));
store.unreserve(0xdeadbeefL, 30);
assertEquals(TStatus.UNKNOWN,
store.waitForStatusChange(0xdeadbeefL, EnumSet.allOf(TStatus.class)));
- assertEquals("property", store.getProperty(0xdeadbeefL,
"com.example.anyproperty"));
+ assertEquals("txInfo", store.getTransactionInfo(0xdeadbeefL,
Fate.TxInfo.RETURN_VALUE));
assertEquals(Collections.<Long>emptyList(), store.list());
EasyMock.verify(repo);
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java
b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java
index 14f7796a4b..8e47bdb656 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java
@@ -136,7 +136,7 @@ class FateMetricValues {
// incr count for op type for for in_progress transactions.
if (ReadOnlyTStore.TStatus.IN_PROGRESS.equals(tx.getStatus())) {
- String opType = tx.getDebug();
+ String opType = tx.getRepoTarget();
if (opType == null || opType.isEmpty()) {
opType = "UNKNOWN";
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ManagerRepo.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ManagerRepo.java
index 0c5c154910..4371bda979 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ManagerRepo.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/ManagerRepo.java
@@ -34,7 +34,7 @@ public abstract class ManagerRepo implements Repo<Manager> {
public void undo(long tid, Manager environment) throws Exception {}
@Override
- public String getDescription() {
+ public String getName() {
return this.getClass().getSimpleName();
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java
index c70e8cd2d6..a1002c2191 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java
@@ -42,7 +42,7 @@ public class TraceRepo<T> implements Repo<T> {
@Override
public long isReady(long tid, T environment) throws Exception {
- Span span = TraceUtil.startFateSpan(repo.getClass(),
repo.getDescription(), tinfo);
+ Span span = TraceUtil.startFateSpan(repo.getClass(), repo.getName(),
tinfo);
try (Scope scope = span.makeCurrent()) {
return repo.isReady(tid, environment);
} catch (Exception e) {
@@ -55,7 +55,7 @@ public class TraceRepo<T> implements Repo<T> {
@Override
public Repo<T> call(long tid, T environment) throws Exception {
- Span span = TraceUtil.startFateSpan(repo.getClass(),
repo.getDescription(), tinfo);
+ Span span = TraceUtil.startFateSpan(repo.getClass(), repo.getName(),
tinfo);
try (Scope scope = span.makeCurrent()) {
Repo<T> result = repo.call(tid, environment);
if (result == null)
@@ -71,7 +71,7 @@ public class TraceRepo<T> implements Repo<T> {
@Override
public void undo(long tid, T environment) throws Exception {
- Span span = TraceUtil.startFateSpan(repo.getClass(),
repo.getDescription(), tinfo);
+ Span span = TraceUtil.startFateSpan(repo.getClass(), repo.getName(),
tinfo);
try (Scope scope = span.makeCurrent()) {
repo.undo(tid, environment);
} catch (Exception e) {
@@ -83,8 +83,8 @@ public class TraceRepo<T> implements Repo<T> {
}
@Override
- public String getDescription() {
- return repo.getDescription();
+ public String getName() {
+ return repo.getName();
}
@Override
diff --git
a/shell/src/main/java/org/apache/accumulo/shell/commands/fateCommand/FateSummaryReport.java
b/shell/src/main/java/org/apache/accumulo/shell/commands/fateCommand/FateSummaryReport.java
index 2a76c08ba1..0e8cc1ebbe 100644
---
a/shell/src/main/java/org/apache/accumulo/shell/commands/fateCommand/FateSummaryReport.java
+++
b/shell/src/main/java/org/apache/accumulo/shell/commands/fateCommand/FateSummaryReport.java
@@ -72,7 +72,7 @@ public class FateSummaryReport {
}
String top = txnStatus.getTop();
stepCounts.merge(Objects.requireNonNullElse(top, "?"), 1, Integer::sum);
- String debug = txnStatus.getDebug();
+ String debug = txnStatus.getRepoTarget();
cmdCounts.merge(Objects.requireNonNullElse(debug, "?"), 1, Integer::sum);
// filter status if provided.
diff --git
a/shell/src/main/java/org/apache/accumulo/shell/commands/fateCommand/FateTxnDetails.java
b/shell/src/main/java/org/apache/accumulo/shell/commands/fateCommand/FateTxnDetails.java
index fd20b9946a..e7bad94ca7 100644
---
a/shell/src/main/java/org/apache/accumulo/shell/commands/fateCommand/FateTxnDetails.java
+++
b/shell/src/main/java/org/apache/accumulo/shell/commands/fateCommand/FateTxnDetails.java
@@ -71,8 +71,8 @@ public class FateTxnDetails implements
Comparable<FateTxnDetails> {
if (txnStatus.getTop() != null) {
step = txnStatus.getTop();
}
- if (txnStatus.getDebug() != null) {
- command = txnStatus.getDebug();
+ if (txnStatus.getRepoTarget() != null) {
+ command = txnStatus.getRepoTarget();
}
if (txnStatus.getTxid() != null) {
txnId = txnStatus.getTxid();
diff --git
a/shell/src/test/java/org/apache/accumulo/shell/commands/fateCommand/SummaryReportTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/fateCommand/SummaryReportTest.java
index 7fcbfacfa1..c660b05059 100644
---
a/shell/src/test/java/org/apache/accumulo/shell/commands/fateCommand/SummaryReportTest.java
+++
b/shell/src/test/java/org/apache/accumulo/shell/commands/fateCommand/SummaryReportTest.java
@@ -67,7 +67,7 @@ class SummaryReportTest {
expect(status1.getTimeCreated()).andReturn(now -
TimeUnit.DAYS.toMillis(1)).anyTimes();
expect(status1.getStatus()).andReturn(ReadOnlyTStore.TStatus.IN_PROGRESS).anyTimes();
expect(status1.getTop()).andReturn(null).anyTimes();
- expect(status1.getDebug()).andReturn(null).anyTimes();
+ expect(status1.getRepoTarget()).andReturn(null).anyTimes();
expect(status1.getTxid()).andReturn("abcdabcd").anyTimes();
expect(status1.getHeldLocks()).andReturn(List.of()).anyTimes();
expect(status1.getWaitingLocks()).andReturn(List.of()).anyTimes();
diff --git
a/shell/src/test/java/org/apache/accumulo/shell/commands/fateCommand/TxnDetailsTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/fateCommand/TxnDetailsTest.java
index 9889e3f609..1d8c65389a 100644
---
a/shell/src/test/java/org/apache/accumulo/shell/commands/fateCommand/TxnDetailsTest.java
+++
b/shell/src/test/java/org/apache/accumulo/shell/commands/fateCommand/TxnDetailsTest.java
@@ -52,7 +52,7 @@ class TxnDetailsTest {
expect(status1.getTimeCreated()).andReturn(now -
TimeUnit.DAYS.toMillis(1)).anyTimes();
expect(status1.getStatus()).andReturn(ReadOnlyTStore.TStatus.IN_PROGRESS).anyTimes();
expect(status1.getTop()).andReturn("step1").anyTimes();
- expect(status1.getDebug()).andReturn("command1").anyTimes();
+ expect(status1.getRepoTarget()).andReturn("command1").anyTimes();
expect(status1.getTxid()).andReturn("abcdabcd").anyTimes();
expect(status1.getHeldLocks()).andReturn(List.of()).anyTimes();
expect(status1.getWaitingLocks()).andReturn(List.of()).anyTimes();
@@ -61,7 +61,7 @@ class TxnDetailsTest {
expect(status2.getTimeCreated()).andReturn(now -
TimeUnit.DAYS.toMillis(7)).anyTimes();
expect(status2.getStatus()).andReturn(ReadOnlyTStore.TStatus.IN_PROGRESS).anyTimes();
expect(status2.getTop()).andReturn("step2").anyTimes();
- expect(status2.getDebug()).andReturn("command2").anyTimes();
+ expect(status2.getRepoTarget()).andReturn("command2").anyTimes();
expect(status2.getTxid()).andReturn("123456789").anyTimes();
expect(status2.getHeldLocks()).andReturn(List.of()).anyTimes();
expect(status2.getWaitingLocks()).andReturn(List.of()).anyTimes();
@@ -95,7 +95,7 @@ class TxnDetailsTest {
expect(status1.getTimeCreated()).andReturn(now -
TimeUnit.DAYS.toMillis(1)).anyTimes();
expect(status1.getStatus()).andReturn(ReadOnlyTStore.TStatus.IN_PROGRESS).anyTimes();
expect(status1.getTop()).andReturn("step1").anyTimes();
- expect(status1.getDebug()).andReturn("command1").anyTimes();
+ expect(status1.getRepoTarget()).andReturn("command1").anyTimes();
expect(status1.getTxid()).andReturn("abcdabcd").anyTimes();
// incomplete lock info (W unknown ns id, no table))
expect(status1.getHeldLocks()).andReturn(List.of("R:1", "R:2",
"W:a")).anyTimes();
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 944180768a..cfd7483be8 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
@@ -384,10 +384,10 @@ public class FateConcurrencyIT extends
AccumuloClusterHarness {
log.trace("Fate id: {}, status: {}", tx.getTxid(), tx.getStatus());
String top = tx.getTop();
- String debug = tx.getDebug();
+ String debug = tx.getRepoTarget();
return top != null && debug != null && top.contains("CompactionDriver")
- && tx.getDebug().contains("CompactRange");
+ && tx.getRepoTarget().contains("CompactRange");
}
