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
commit 036052f484f4f80e582f53202bf077662b4f4b9c Merge: a68eba3bb9 4d016baa4f Author: Dave Marion <[email protected]> AuthorDate: Wed Dec 3 20:48:10 2025 +0000 Merge branch '2.1' .../miniclusterImpl/MiniAccumuloClusterImpl.java | 15 ++------ .../miniclusterImpl/MiniAccumuloConfigImpl.java | 45 +++++++++++++++++++++- 2 files changed, 47 insertions(+), 13 deletions(-) diff --cc minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java index 620d4883b8,dbbbf5aecd..a0bd1d2292 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java @@@ -28,16 -28,15 +28,18 @@@ import static org.apache.accumulo.minic import java.io.File; import java.io.IOException; +import java.io.UncheckedIOException; +import java.net.MalformedURLException; +import java.nio.file.Path; import java.util.EnumMap; import java.util.HashMap; + import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; -import java.util.Objects; + import java.util.Set; import java.util.function.Consumer; +import java.util.function.Function; import org.apache.accumulo.compactor.Compactor; import org.apache.accumulo.core.conf.ClientProperty; @@@ -82,12 -77,19 +84,13 @@@ public class MiniAccumuloConfigImpl private String rootPassword = null; private Map<String,String> hadoopConfOverrides = new HashMap<>(); private Map<String,String> siteConfig = new HashMap<>(); - private Map<String,String> configuredSiteConig = new HashMap<>(); + private Map<String,String> configuredSiteConfig = new HashMap<>(); private Map<String,String> clientProps = new HashMap<>(); - private int numTservers = 2; - private int numScanServers = 0; - private int numCompactors = 1; 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<>(); + private final Map<String,String> systemProperties = new HashMap<>(); + private final Set<String> jvmOptions = new HashSet<>(); private String instanceName = "miniInstance"; private String rootUserName = "root"; @@@ -132,9 -132,13 +135,14 @@@ * @param rootPassword The initial password for the Accumulo root user */ public MiniAccumuloConfigImpl(File dir, String rootPassword) { - this.dir = dir; + this.dir = dir.toPath(); this.rootPassword = rootPassword; + this.serverConfiguration = new ClusterServerConfiguration(); + // Set default options + this.jvmOptions.add("-XX:+PerfDisableSharedMem"); + this.jvmOptions.add("-XX:+AlwaysPreTouch"); + this.systemProperties.put("-Dapple.awt.UIElement", "true"); + this.systemProperties.put("-Djava.net.preferIPv4Stack", "true"); } /**
