This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 7e8f9d3b4a1a2a53d1d880623e01de6a16aac63b
Merge: e15757f68b 2c4ffc2859
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon Jan 8 12:21:11 2024 -0500
Merge branch 'main' into elasticity
.../core/client/admin/NamespaceOperations.java | 18 +++++++-------
.../core/client/admin/TableOperations.java | 28 ++++++++++++----------
.../accumulo/manager/FateServiceHandler.java | 7 +++---
.../tableOps/tableImport/FinishImportTable.java | 5 ++--
.../manager/tableOps/tableImport/ImportTable.java | 4 ++--
.../tableOps/tableImport/ImportedTableInfo.java | 2 +-
.../org/apache/accumulo/test/ImportExportIT.java | 2 ++
.../test/compaction/ExternalCompaction4_IT.java | 1 +
.../accumulo/test/functional/CompactionIT.java | 1 +
9 files changed, 37 insertions(+), 31 deletions(-)
diff --cc
test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java
index 140f746b99,12b0eb5286..4d4364e980
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java
@@@ -56,7 -61,9 +56,8 @@@ public class ExternalCompaction4_IT ext
public void testErrorDuringCompactionNoOutput() throws Exception {
final String table1 = this.getUniqueNames(1)[0];
try (AccumuloClient client =
Accumulo.newClient().from(getClientProps()).build()) {
-
getCluster().getClusterControl().startCoordinator(CompactionCoordinator.class);
- getCluster().getClusterControl().startCompactors(Compactor.class, 1,
QUEUE1);
createTable(client, table1, "cs1");
++ client.tableOperations().setProperty(table1,
Property.TABLE_FILE_MAX.getKey(), "1001");
client.tableOperations().setProperty(table1,
Property.TABLE_MAJC_RATIO.getKey(), "51");
TableId tid =
TableId.of(client.tableOperations().tableIdMap().get(table1));
