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 36dde96d21 fix IT failures from PR#5861 (#5871)
36dde96d21 is described below
commit 36dde96d21ae3700242c381cbfb398a4801be168
Author: Kevin Rathbun <[email protected]>
AuthorDate: Mon Sep 8 12:23:44 2025 -0400
fix IT failures from PR#5861 (#5871)
---
.../test/compaction/ExternalCompactionTestUtils.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
index 2235b429b6..18b6edae03 100644
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
@@ -54,12 +54,12 @@ import
org.apache.accumulo.core.compaction.thrift.TCompactionState;
import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
import org.apache.accumulo.core.compaction.thrift.TExternalCompactionMap;
import org.apache.accumulo.core.conf.ClientProperty;
+import org.apache.accumulo.core.conf.ConfigurationCopy;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.fate.Fate;
import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
@@ -74,6 +74,7 @@ import
org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.test.compaction.ExternalCompaction_1_IT.TestFilter;
+import org.apache.accumulo.test.fate.FateTestUtil;
import org.apache.accumulo.test.util.Wait;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.RawLocalFileSystem;
@@ -242,10 +243,11 @@ public class ExternalCompactionTestUtils {
cfg.setProperty(Property.COMPACTOR_MIN_JOB_WAIT_TIME, "100ms");
cfg.setProperty(Property.COMPACTOR_MAX_JOB_WAIT_TIME, "1s");
cfg.setProperty(Property.GENERAL_THREADPOOL_SIZE, "10");
- cfg.setProperty(Property.MANAGER_FATE_USER_CONFIG, "{\"" +
Fate.FateOperation
-
.getAllUserFateOps().stream().map(Enum::name).collect(Collectors.joining(","))
+ "\": 10}");
- cfg.setProperty(Property.MANAGER_FATE_META_CONFIG, "{\"" +
Fate.FateOperation
-
.getAllMetaFateOps().stream().map(Enum::name).collect(Collectors.joining(","))
+ "\": 10}");
+ var fateCfg = FateTestUtil.updateFateConfig(new ConfigurationCopy(), 10,
"AllFateOps");
+ cfg.setProperty(Property.MANAGER_FATE_USER_CONFIG,
+ fateCfg.get(Property.MANAGER_FATE_USER_CONFIG));
+ cfg.setProperty(Property.MANAGER_FATE_META_CONFIG,
+ fateCfg.get(Property.MANAGER_FATE_META_CONFIG));
cfg.setProperty(Property.MANAGER_TABLET_GROUP_WATCHER_INTERVAL, "1s");
// use raw local file system so walogs sync and flush will work
coreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());