This is an automated email from the ASF dual-hosted git repository. krathbun pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit b0c1c0f98fb2f7b3d1fd9d50991c5ef98a6ce1aa Merge: 382f90648f 0857b4520c Author: Kevin Rathbun <[email protected]> AuthorDate: Tue Jan 20 09:25:25 2026 -0500 Merge branch '2.1' .../java/org/apache/accumulo/manager/FateServiceHandler.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --cc server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java index ae4cd5d3e3,57e3858a2d..1be180e3f2 --- a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java @@@ -67,22 -62,15 +67,21 @@@ import org.apache.accumulo.core.clientI import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.NamespaceId; import org.apache.accumulo.core.data.TableId; -import org.apache.accumulo.core.fate.ReadOnlyTStore.TStatus; +import org.apache.accumulo.core.dataImpl.KeyExtent; +import org.apache.accumulo.core.dataImpl.thrift.TRange; +import org.apache.accumulo.core.fate.Fate; +import org.apache.accumulo.core.fate.FateId; +import org.apache.accumulo.core.fate.FateInstanceType; +import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus; import org.apache.accumulo.core.manager.state.tables.TableState; -import org.apache.accumulo.core.manager.thrift.FateOperation; +import org.apache.accumulo.core.manager.thrift.BulkImportState; import org.apache.accumulo.core.manager.thrift.FateService; -import org.apache.accumulo.core.master.thrift.BulkImportState; +import org.apache.accumulo.core.manager.thrift.TFateId; +import org.apache.accumulo.core.manager.thrift.TFateInstanceType; +import org.apache.accumulo.core.manager.thrift.TFateOperation; - import org.apache.accumulo.core.manager.thrift.ThriftPropertyException; import org.apache.accumulo.core.securityImpl.thrift.TCredentials; -import org.apache.accumulo.core.trace.thrift.TInfo; import org.apache.accumulo.core.util.ByteBufferUtil; -import org.apache.accumulo.core.util.FastFormat; +import org.apache.accumulo.core.util.TextUtil; import org.apache.accumulo.core.util.Validator; import org.apache.accumulo.core.util.tables.TableNameUtil; import org.apache.accumulo.core.volume.Volume; @@@ -135,15 -115,11 +134,15 @@@ class FateServiceHandler implements Fat } @Override - public void executeFateOperation(TInfo tinfo, TCredentials c, long opid, FateOperation op, + public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, TFateOperation top, List<ByteBuffer> arguments, Map<String,String> options, boolean autoCleanup) - throws ThriftSecurityException, ThriftTableOperationException, ThriftPropertyException { + throws ThriftSecurityException, ThriftTableOperationException { authenticate(c); + Fate.FateOperation op = Fate.FateOperation.fromThrift(top); String goalMessage = op.toString() + " "; + String txUUIDStr = opid.getTxUUIDStr(); + FateInstanceType type = FateInstanceType.fromThrift(opid.getType()); + FateId fateId = FateId.from(type, txUUIDStr); switch (op) { case NAMESPACE_CREATE: {
