This is an automated email from the ASF dual-hosted git repository.
dlmarion 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 3037686d8e Allow IT classes to override server class at the resource
group level (#5692)
3037686d8e is described below
commit 3037686d8e891c1ca340af977a8660375bb8ba76
Author: Dave Marion <[email protected]>
AuthorDate: Wed Jul 2 11:52:04 2025 -0400
Allow IT classes to override server class at the resource group level
(#5692)
Modified MiniAccumuloConfigImpl.setServerClass such that the user
can supply an override class to use per resource group. If no class
override is specified, then the default implementations are used.
When overriding classes for the Compactor in an IT, the default
resource group may need to use the default implementation to
ensure that the root and metadata tables are compacting.
Closes #5683
---
.../MiniAccumuloClusterControl.java | 38 ++++++++++++++--------
.../miniclusterImpl/MiniAccumuloConfigImpl.java | 29 +++++++++--------
.../accumulo/test/ComprehensiveFlakyAmpleIT.java | 4 +--
.../accumulo/test/ComprehensiveFlakyFateIT.java | 2 +-
.../apache/accumulo/test/ScanServerShutdownIT.java | 2 +-
.../apache/accumulo/test/VolumeFlakyAmpleIT.java | 4 +--
.../test/compaction/ExternalCompaction2ITBase.java | 5 ++-
.../compaction/FlakyExternalCompaction2IT.java | 4 +--
.../test/functional/CompactionFlakyAmpleIT.java | 4 +--
.../test/functional/DeleteRowsFlakyFateIT.java | 2 +-
.../test/functional/HalfDeadServerWatcherIT.java | 2 +-
.../test/functional/MemoryStarvedMajCIT.java | 2 +-
.../test/functional/MergeTabletsFlakyFateIT.java | 2 +-
.../OnDemandTabletUnloadingFlakyAmpleIT.java | 4 +--
.../accumulo/test/functional/WALFlakyAmpleIT.java | 4 +--
15 files changed, 62 insertions(+), 46 deletions(-)
diff --git
a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
index 25aed200b0..a7445302c5 100644
---
a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
@@ -35,6 +35,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.apache.accumulo.cluster.ClusterControl;
+import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl.ProcessInfo;
@@ -138,13 +139,6 @@ public class MiniAccumuloClusterControl implements
ClusterControl {
return;
}
- Class<?> classToUse;
- if (classOverride != null) {
- classToUse = classOverride;
- } else {
- classToUse = cluster.getConfig().getServerClass(server);
- }
-
switch (server) {
case TABLET_SERVER:
synchronized (tabletServerProcesses) {
@@ -153,6 +147,8 @@ public class MiniAccumuloClusterControl implements
ClusterControl {
for (Entry<String,Integer> e : tserverGroups.entrySet()) {
List<Process> processes =
tabletServerProcesses.computeIfAbsent(e.getKey(), k -> new
ArrayList<>());
+ Class<?> classToUse = classOverride != null ? classOverride
+ : cluster.getConfig().getServerClass(server, e.getKey());
int count = 0;
for (int i = processes.size(); count < limit && i < e.getValue();
i++, ++count) {
processes
@@ -168,11 +164,15 @@ public class MiniAccumuloClusterControl implements
ClusterControl {
break;
case MANAGER:
if (managerProcess == null) {
+ Class<?> classToUse = classOverride != null ? classOverride
+ : cluster.getConfig().getServerClass(server,
Constants.DEFAULT_RESOURCE_GROUP_NAME);
managerProcess = cluster._exec(classToUse, server, configOverrides,
args).getProcess();
}
break;
case ZOOKEEPER:
if (zooKeeperProcess == null) {
+ Class<?> classToUse = classOverride != null ? classOverride
+ : cluster.getConfig().getServerClass(server,
Constants.DEFAULT_RESOURCE_GROUP_NAME);
zooKeeperProcess = cluster
._exec(classToUse, server, configOverrides,
cluster.getZooCfgFile().getAbsolutePath())
.getProcess();
@@ -180,11 +180,15 @@ public class MiniAccumuloClusterControl implements
ClusterControl {
break;
case GARBAGE_COLLECTOR:
if (gcProcess == null) {
+ Class<?> classToUse = classOverride != null ? classOverride
+ : cluster.getConfig().getServerClass(server,
Constants.DEFAULT_RESOURCE_GROUP_NAME);
gcProcess = cluster._exec(classToUse, server, configOverrides,
args).getProcess();
}
break;
case MONITOR:
if (monitor == null) {
+ Class<?> classToUse = classOverride != null ? classOverride
+ : cluster.getConfig().getServerClass(server,
Constants.DEFAULT_RESOURCE_GROUP_NAME);
monitor = cluster._exec(classToUse, server, configOverrides,
args).getProcess();
}
break;
@@ -195,6 +199,8 @@ public class MiniAccumuloClusterControl implements
ClusterControl {
for (Entry<String,Integer> e : sserverGroups.entrySet()) {
List<Process> processes =
scanServerProcesses.computeIfAbsent(e.getKey(), k -> new
ArrayList<>());
+ Class<?> classToUse = classOverride != null ? classOverride
+ : cluster.getConfig().getServerClass(server, e.getKey());
int count = 0;
for (int i = processes.size(); count < limit && i < e.getValue();
i++, ++count) {
processes
@@ -213,16 +219,20 @@ public class MiniAccumuloClusterControl implements
ClusterControl {
Map<String,Integer> compactorGroups =
cluster.getConfig().getClusterServerConfiguration().getCompactorConfiguration();
for (Entry<String,Integer> e : compactorGroups.entrySet()) {
+ final String rg = e.getKey();
List<Process> processes =
- compactorProcesses.computeIfAbsent(e.getKey(), k -> new
ArrayList<>());
+ compactorProcesses.computeIfAbsent(rg, k -> new ArrayList<>());
+ Class<?> classToUse = classOverride != null ? classOverride
+ : cluster.getConfig().getServerClass(server, e.getKey());
int count = 0;
+ // Override the Compactor classToUse for the default resource
group. In the cases
+ // where the ExternalDoNothingCompactor and
MemoryConsumingCompactor are used, they
+ // should be used in a non-default resource group. We need the
default resource
+ // group to compact normally for the root and metadata tables.
for (int i = processes.size(); count < limit && i < e.getValue();
i++, ++count) {
- processes
- .add(cluster
- ._exec(classToUse, server, configOverrides,
- ArrayUtils.addAll(args, "-o",
- Property.COMPACTOR_GROUP_NAME.getKey() + "=" +
e.getKey()))
- .getProcess());
+ processes.add(cluster._exec(classToUse, server, configOverrides,
+ ArrayUtils.addAll(args, "-o",
Property.COMPACTOR_GROUP_NAME.getKey() + "=" + rg))
+ .getProcess());
}
}
}
diff --git
a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
index daa599a3ee..4c48afd0ce 100644
---
a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
@@ -35,8 +35,8 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Objects;
import java.util.function.Consumer;
+import java.util.function.Function;
import org.apache.accumulo.compactor.Compactor;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
@@ -70,6 +70,11 @@ public class MiniAccumuloConfigImpl {
private static final Logger log =
LoggerFactory.getLogger(MiniAccumuloConfigImpl.class);
private static final String DEFAULT_INSTANCE_SECRET = "DONTTELL";
static final String DEFAULT_ZOOKEEPER_HOST = "127.0.0.1";
+ private static final EnumMap<ServerType,Function<String,Class<?>>>
DEFAULT_SERVER_CLASSES =
+ new EnumMap<>(Map.of(MANAGER, rg -> Manager.class, GARBAGE_COLLECTOR,
+ rg -> SimpleGarbageCollector.class, MONITOR, rg -> Monitor.class,
ZOOKEEPER,
+ rg -> ZooKeeperServerMain.class, TABLET_SERVER, rg ->
TabletServer.class, SCAN_SERVER,
+ rg -> ScanServer.class, COMPACTOR, rg -> Compactor.class));
private Path dir = null;
private String rootPassword = null;
@@ -78,10 +83,7 @@ public class MiniAccumuloConfigImpl {
private Map<String,String> configuredSiteConfig = new HashMap<>();
private Map<String,String> clientProps = new HashMap<>();
private Map<ServerType,Long> memoryConfig = new HashMap<>();
- private final EnumMap<ServerType,Class<?>> serverTypeClasses =
- new EnumMap<>(Map.of(MANAGER, Manager.class, GARBAGE_COLLECTOR,
SimpleGarbageCollector.class,
- MONITOR, Monitor.class, ZOOKEEPER, ZooKeeperServerMain.class,
TABLET_SERVER,
- TabletServer.class, SCAN_SERVER, ScanServer.class, COMPACTOR,
Compactor.class));
+ private final Map<ServerType,Function<String,Class<?>>>
rgServerClassOverrides = new HashMap<>();
private boolean jdwpEnabled = false;
private Map<String,String> systemProperties = new HashMap<>();
@@ -407,22 +409,23 @@ public class MiniAccumuloConfigImpl {
}
/**
- * Sets the class that will be used to instantiate this server type.
+ * Sets a function that returns the class that will be used to instantiate
this server type given
+ * a resource group.
*/
- public MiniAccumuloConfigImpl setServerClass(ServerType type, Class<?>
serverClass) {
- serverTypeClasses.put(type, Objects.requireNonNull(serverClass));
+ public MiniAccumuloConfigImpl setServerClass(ServerType type,
Function<String,Class<?>> func) {
+ rgServerClassOverrides.put(type, func);
return this;
}
/**
* @return the class to use to instantiate this server type.
*/
- public Class<?> getServerClass(ServerType type) {
- var clazz = serverTypeClasses.get(type);
- if (clazz == null) {
- throw new IllegalStateException("Server type " + type + " has no class");
+ public Class<?> getServerClass(ServerType type, String rg) {
+ Class<?> clazz = rgServerClassOverrides.getOrDefault(type, r ->
null).apply(rg);
+ if (clazz != null) {
+ return clazz;
}
- return clazz;
+ return DEFAULT_SERVER_CLASSES.get(type).apply(rg);
}
/**
diff --git
a/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyAmpleIT.java
b/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyAmpleIT.java
index 7823b5f05b..100985e34e 100644
--- a/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyAmpleIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyAmpleIT.java
@@ -36,8 +36,8 @@ public class ComprehensiveFlakyAmpleIT extends
ComprehensiveITBase {
@BeforeAll
public static void setup() throws Exception {
SharedMiniClusterBase.startMiniClusterWithConfig((cfg, coreSite) -> {
- cfg.setServerClass(ServerType.MANAGER, FlakyAmpleManager.class);
- cfg.setServerClass(ServerType.TABLET_SERVER, FlakyAmpleTserver.class);
+ cfg.setServerClass(ServerType.MANAGER, r -> FlakyAmpleManager.class);
+ cfg.setServerClass(ServerType.TABLET_SERVER, r ->
FlakyAmpleTserver.class);
});
try (AccumuloClient client =
Accumulo.newClient().from(getClientProps()).build()) {
diff --git
a/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyFateIT.java
b/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyFateIT.java
index a068638cea..7c31118d20 100644
--- a/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyFateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyFateIT.java
@@ -34,7 +34,7 @@ public class ComprehensiveFlakyFateIT extends
ComprehensiveITBase {
@BeforeAll
public static void setup() throws Exception {
SharedMiniClusterBase.startMiniClusterWithConfig(
- (cfg, coreSite) -> cfg.setServerClass(ServerType.MANAGER,
FlakyFateManager.class));
+ (cfg, coreSite) -> cfg.setServerClass(ServerType.MANAGER, r ->
FlakyFateManager.class));
try (AccumuloClient client =
Accumulo.newClient().from(getClientProps()).build()) {
client.securityOperations().changeUserAuthorizations("root",
AUTHORIZATIONS);
diff --git
a/test/src/main/java/org/apache/accumulo/test/ScanServerShutdownIT.java
b/test/src/main/java/org/apache/accumulo/test/ScanServerShutdownIT.java
index 59fba1b2ad..ed6238f759 100644
--- a/test/src/main/java/org/apache/accumulo/test/ScanServerShutdownIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ScanServerShutdownIT.java
@@ -66,7 +66,7 @@ public class ScanServerShutdownIT extends
SharedMiniClusterBase {
cfg.setProperty(Property.SSERV_SCAN_EXECUTORS_DEFAULT_THREADS, "1");
// Set our custom implementation that shuts down after 3 batch scans
- cfg.setServerClass(ServerType.SCAN_SERVER, SelfStoppingScanServer.class);
+ cfg.setServerClass(ServerType.SCAN_SERVER, rg ->
SelfStoppingScanServer.class);
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/VolumeFlakyAmpleIT.java
b/test/src/main/java/org/apache/accumulo/test/VolumeFlakyAmpleIT.java
index 1262c00fa0..12458e2fc3 100644
--- a/test/src/main/java/org/apache/accumulo/test/VolumeFlakyAmpleIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VolumeFlakyAmpleIT.java
@@ -31,8 +31,8 @@ public class VolumeFlakyAmpleIT extends VolumeITBase {
@Override
public void configure(MiniAccumuloConfigImpl cfg, Configuration
hadoopCoreSite) {
super.configure(cfg, hadoopCoreSite);
- cfg.setServerClass(ServerType.MANAGER, FlakyAmpleManager.class);
- cfg.setServerClass(ServerType.TABLET_SERVER, FlakyAmpleTserver.class);
+ cfg.setServerClass(ServerType.MANAGER, rg -> FlakyAmpleManager.class);
+ cfg.setServerClass(ServerType.TABLET_SERVER, rg ->
FlakyAmpleTserver.class);
// The test creates a lots of tablet that need to compact. Reserving and
commiting compactions
// is slower because of FlakyAmple causing conditional mutations to fail.
So start more
// compactors to compensate for this.
diff --git
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction2ITBase.java
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction2ITBase.java
index 3172d23caf..9622cf0566 100644
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction2ITBase.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction2ITBase.java
@@ -43,6 +43,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
+import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.AccumuloException;
@@ -76,7 +77,9 @@ public abstract class ExternalCompaction2ITBase extends
SharedMiniClusterBase {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration
coreSite) {
ExternalCompactionTestUtils.configureMiniCluster(cfg, coreSite);
- cfg.setServerClass(ServerType.COMPACTOR,
ExternalDoNothingCompactor.class);
+ cfg.setServerClass(ServerType.COMPACTOR,
+ rg -> !rg.equals(Constants.DEFAULT_RESOURCE_GROUP_NAME) ?
ExternalDoNothingCompactor.class
+ : null);
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/compaction/FlakyExternalCompaction2IT.java
b/test/src/main/java/org/apache/accumulo/test/compaction/FlakyExternalCompaction2IT.java
index 1bc5445a87..5ef885b50b 100644
---
a/test/src/main/java/org/apache/accumulo/test/compaction/FlakyExternalCompaction2IT.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/FlakyExternalCompaction2IT.java
@@ -41,8 +41,8 @@ public class FlakyExternalCompaction2IT extends
ExternalCompaction2ITBase {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration
coreSite) {
super.configureMiniCluster(cfg, coreSite);
- cfg.setServerClass(ServerType.MANAGER, FlakyAmpleManager.class);
- cfg.setServerClass(ServerType.TABLET_SERVER, FlakyAmpleTserver.class);
+ cfg.setServerClass(ServerType.MANAGER, rg -> FlakyAmpleManager.class);
+ cfg.setServerClass(ServerType.TABLET_SERVER, rg ->
FlakyAmpleTserver.class);
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/CompactionFlakyAmpleIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/CompactionFlakyAmpleIT.java
index 0b27ac5b0f..69bec2751d 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/CompactionFlakyAmpleIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/CompactionFlakyAmpleIT.java
@@ -28,7 +28,7 @@ public class CompactionFlakyAmpleIT extends CompactionITBase {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration
hadoopCoreSite) {
super.configureMiniCluster(cfg, hadoopCoreSite);
- cfg.setServerClass(ServerType.MANAGER, FlakyAmpleManager.class);
- cfg.setServerClass(ServerType.TABLET_SERVER, FlakyAmpleTserver.class);
+ cfg.setServerClass(ServerType.MANAGER, rg -> FlakyAmpleManager.class);
+ cfg.setServerClass(ServerType.TABLET_SERVER, rg ->
FlakyAmpleTserver.class);
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsFlakyFateIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsFlakyFateIT.java
index 79e8e4895d..690701d9dd 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsFlakyFateIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsFlakyFateIT.java
@@ -30,6 +30,6 @@ import org.apache.hadoop.conf.Configuration;
public class DeleteRowsFlakyFateIT extends DeleteRowsIT {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration
hadoopCoreSite) {
- cfg.setServerClass(ServerType.MANAGER, FlakyFateManager.class);
+ cfg.setServerClass(ServerType.MANAGER, rg -> FlakyFateManager.class);
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java
index a4f6408826..0ea0f85bcd 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java
@@ -122,7 +122,7 @@ public class HalfDeadServerWatcherIT extends
AccumuloClusterHarness {
} else {
cfg.setProperty(Property.GENERAL_SERVER_LOCK_VERIFICATION_INTERVAL, "0");
}
- cfg.setServerClass(ServerType.TABLET_SERVER, HalfDeadTabletServer.class);
+ cfg.setServerClass(ServerType.TABLET_SERVER, rg ->
HalfDeadTabletServer.class);
cfg.setProperty(Property.TSERV_ONDEMAND_UNLOADER_INTERVAL, "30s");
cfg.getClusterServerConfiguration().setNumDefaultCompactors(1);
cfg.getClusterServerConfiguration().setNumDefaultScanServers(0);
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMajCIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMajCIT.java
index 48b2bdb632..57ead6bee6 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMajCIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMajCIT.java
@@ -85,7 +85,7 @@ public class MemoryStarvedMajCIT extends
SharedMiniClusterBase {
cfg.setSystemProperties(sysProps);
// Set a compactor that will consume and free memory when we need it to
- cfg.setServerClass(ServerType.COMPACTOR, MemoryConsumingCompactor.class);
+ cfg.setServerClass(ServerType.COMPACTOR, rg ->
MemoryConsumingCompactor.class);
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsFlakyFateIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsFlakyFateIT.java
index 8020cbecca..148f5cc8e5 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsFlakyFateIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsFlakyFateIT.java
@@ -33,7 +33,7 @@ public class MergeTabletsFlakyFateIT extends
MergeTabletsITBase {
@BeforeAll
public static void setup() throws Exception {
SharedMiniClusterBase.startMiniClusterWithConfig((cfg, coreSite) -> {
- cfg.setServerClass(ServerType.MANAGER, FlakyFateManager.class);
+ cfg.setServerClass(ServerType.MANAGER, rg -> FlakyFateManager.class);
});
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingFlakyAmpleIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingFlakyAmpleIT.java
index f7068da596..5f69759552 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingFlakyAmpleIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingFlakyAmpleIT.java
@@ -49,8 +49,8 @@ public class OnDemandTabletUnloadingFlakyAmpleIT extends
SharedMiniClusterBase {
cfg.setProperty(Property.MANAGER_TABLET_GROUP_WATCHER_INTERVAL, "1s");
cfg.setProperty(Property.TSERV_ONDEMAND_UNLOADER_INTERVAL, "3s");
cfg.setProperty("table.custom.ondemand.unloader.inactivity.threshold.seconds",
"3");
- cfg.setServerClass(ServerType.TABLET_SERVER, FlakyAmpleTserver.class);
- cfg.setServerClass(ServerType.MANAGER, FlakyAmpleManager.class);
+ cfg.setServerClass(ServerType.TABLET_SERVER, rg ->
FlakyAmpleTserver.class);
+ cfg.setServerClass(ServerType.MANAGER, rg -> FlakyAmpleManager.class);
});
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/WALFlakyAmpleIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/WALFlakyAmpleIT.java
index 2b9b211ad8..9b838d00bb 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/WALFlakyAmpleIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/WALFlakyAmpleIT.java
@@ -28,7 +28,7 @@ public class WALFlakyAmpleIT extends WALSunnyDayITBase {
@Override
protected void configure(MiniAccumuloConfigImpl cfg, Configuration
hadoopCoreSite) {
super.configure(cfg, hadoopCoreSite);
- cfg.setServerClass(ServerType.TABLET_SERVER, FlakyAmpleTserver.class);
- cfg.setServerClass(ServerType.MANAGER, FlakyAmpleManager.class);
+ cfg.setServerClass(ServerType.TABLET_SERVER, rg ->
FlakyAmpleTserver.class);
+ cfg.setServerClass(ServerType.MANAGER, rg -> FlakyAmpleManager.class);
}
}
