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 61a1e572d985a28a9eaf9f3b5b755c072a69167b Merge: 9fe684152c 57024c2c76 Author: Dave Marion <[email protected]> AuthorDate: Thu Jan 15 23:28:16 2026 +0000 Merge branch '2.1' .../miniclusterImpl/MiniAccumuloClusterImpl.java | 13 ++++++- .../miniclusterImpl/MiniAccumuloConfigImpl.java | 36 ++---------------- .../accumulo/monitor/resources/js/bulkImport.js | 43 +++++++++++++++++++--- .../accumulo/test/tracing/ScanTracingIT.java | 2 +- 4 files changed, 54 insertions(+), 40 deletions(-) diff --cc minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java index ab496e0694,adda1c65be..a5a81efc09 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java @@@ -151,15 -137,14 +151,19 @@@ public class MiniAccumuloClusterImpl im private final AtomicReference<MiniDFSCluster> miniDFS = new AtomicReference<>(); private final List<Process> cleanup = new ArrayList<>(); private final MiniAccumuloClusterControl clusterControl; + private final Supplier<ServerContext> context; + private final AtomicBoolean serverContextCreated = new AtomicBoolean(false); + private final Set<String> defaultJvmOpts = + Set.of("-XX:+PerfDisableSharedMem", "-XX:+AlwaysPreTouch"); + private final Map<String,String> defaultSystemProps = + Map.of("apple.awt.UIElement", "true", "java.net.preferIPv4Stack", "true"); private boolean initialized = false; - private ExecutorService executor; + private volatile ExecutorService executor; + private ServiceLock miniLock; + private ZooSession miniLockZk; + private AccumuloClient client; + private volatile State clusterState = State.STOPPED; /** * diff --cc minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java index a0bd1d2292,8e81809563..a09f00df49 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java @@@ -84,12 -77,18 +84,12 @@@ 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 final Map<String,String> systemProperties = new HashMap<>(); + private Map<String,String> systemProperties = new HashMap<>(); private final Set<String> jvmOptions = new HashSet<>(); private String instanceName = "miniInstance"; @@@ -135,14 -132,8 +135,9 @@@ * @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"); } /**
