This is an automated email from the ASF dual-hosted git repository.
krathbun pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new 0857b4520c Fix exception bug with executeFateOperation (#6048)
0857b4520c is described below
commit 0857b4520c6696304ac8682bd21bad4c4e3f5985
Author: Kevin Rathbun <[email protected]>
AuthorDate: Tue Jan 20 09:09:09 2026 -0500
Fix exception bug with executeFateOperation (#6048)
* Fix exception bug with executeFateOperation
ThriftPropertyException was declared as thrown by
FateServiceHandler.executeFateOperation but not by
manager.thrift.executeFateOperation, resulting in the client receiving
an exception without info about the cause. Changed instances in
executeFateOperation of ThriftPropertyException to instead be
ThriftTableOperationException. Client now receives helpful exception.
---
.../java/org/apache/accumulo/manager/FateServiceHandler.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
index 52320225ba..57e3858a2d 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
@@ -66,7 +66,6 @@ import org.apache.accumulo.core.fate.ReadOnlyTStore.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.FateService;
-import org.apache.accumulo.core.manager.thrift.ThriftPropertyException;
import org.apache.accumulo.core.master.thrift.BulkImportState;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.accumulo.core.trace.thrift.TInfo;
@@ -118,7 +117,7 @@ class FateServiceHandler implements FateService.Iface {
@Override
public void executeFateOperation(TInfo tinfo, TCredentials c, long opid,
FateOperation op,
List<ByteBuffer> arguments, Map<String,String> options, boolean
autoCleanup)
- throws ThriftSecurityException, ThriftTableOperationException,
ThriftPropertyException {
+ throws ThriftSecurityException, ThriftTableOperationException {
authenticate(c);
String goalMessage = op.toString() + " ";
@@ -223,7 +222,8 @@ class FateServiceHandler implements FateService.Iface {
if (!Property.isValidTablePropertyKey(entry.getKey())) {
errorMessage = "Invalid Table Property ";
}
- throw new ThriftPropertyException(entry.getKey(), entry.getValue(),
+ throw new ThriftTableOperationException(null, tableName, tableOp,
+ TableOperationExceptionType.OTHER,
errorMessage + entry.getKey() + "=" + entry.getValue());
}
}
@@ -334,7 +334,8 @@ class FateServiceHandler implements FateService.Iface {
if (!Property.isValidTablePropertyKey(entry.getKey())) {
errorMessage = "Invalid Table Property ";
}
- throw new ThriftPropertyException(entry.getKey(), entry.getValue(),
+ throw new ThriftTableOperationException(null, tableName, tableOp,
+ TableOperationExceptionType.OTHER,
errorMessage + entry.getKey() + "=" + entry.getValue());
}