(accumulo) branch main updated: Fixes some minor table op inconsistencies for system tables (#6013)

[krathbun]

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


The following commit(s) were added to refs/heads/main by this push:
     new 5a3485c2fc Fixes some minor table op inconsistencies for system tables 
(#6013)
5a3485c2fc is described below

commit 5a3485c2fc40ba93423f2864410270884850b821
Author: Kevin Rathbun <krath...@apache.org>
AuthorDate: Thu Dec 11 11:19:32 2025 -0500

    Fixes some minor table op inconsistencies for system tables (#6013)
    
    closes #5680
---
 .../main/java/org/apache/accumulo/manager/FateServiceHandler.java    | 3 ++-
 .../org/apache/accumulo/test/ComprehensiveTableOperationsIT.java     | 2 +-
 .../org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java | 5 +++--
 3 files changed, 6 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 358569b19b..ae4cd5d3e3 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
@@ -635,7 +635,8 @@ class FateServiceHandler implements FateService.Iface {
       case TABLE_BULK_IMPORT2: {
         TableOperation tableOp = TableOperation.BULK_IMPORT;
         validateArgumentCount(arguments, tableOp, 3);
-        final var tableId = validateTableIdArgument(arguments.get(0), tableOp, 
NOT_ROOT_TABLE_ID);
+        final var tableId =
+            validateTableIdArgument(arguments.get(0), tableOp, 
NOT_BUILTIN_TABLE_ID);
         String dir = ByteBufferUtil.toString(arguments.get(1));
 
         boolean setTime = 
Boolean.parseBoolean(ByteBufferUtil.toString(arguments.get(2)));
diff --git 
a/test/src/main/java/org/apache/accumulo/test/ComprehensiveTableOperationsIT.java
 
b/test/src/main/java/org/apache/accumulo/test/ComprehensiveTableOperationsIT.java
index 98e2355722..004b00e8e5 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/ComprehensiveTableOperationsIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/ComprehensiveTableOperationsIT.java
@@ -617,7 +617,7 @@ public class ComprehensiveTableOperationsIT extends 
SharedMiniClusterBase {
         getCluster().getServerContext().getConfiguration(), 0, 5, 0);
 
     for (var sysTable : SystemTables.tableNames()) {
-      assertThrows(Exception.class, () -> 
ops.importDirectory(dir).to(sysTable).load());
+      assertThrows(AccumuloException.class, () -> 
ops.importDirectory(dir).to(sysTable).load());
     }
   }
 
diff --git 
a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java
 
b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java
index 909802641f..c0c393af66 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java
@@ -367,8 +367,9 @@ public class CloneTestIT_SimpleSuite extends 
SharedMiniClusterBase {
       for (int i = 0; i < sysTables.length; i++) {
         var sysTable = sysTables[i];
         var cloneTableName = tableNames[i];
-        assertThrows(Exception.class, () -> 
client.tableOperations().clone(sysTable.tableName(),
-            cloneTableName, CloneConfiguration.empty()), () -> "Table:" + 
sysTable.tableName());
+        assertThrows(AccumuloException.class, () -> client.tableOperations()
+            .clone(sysTable.tableName(), cloneTableName, 
CloneConfiguration.empty()),
+            () -> "Table:" + sysTable.tableName());
         assertFalse(client.tableOperations().exists(cloneTableName));
       }
     }