Add support for customizing the server heap size

Author: chrisdennis

galvan-support/src/main/java/org/terracotta/testing/rules/BasicExternalCluster.java

@@ -71,6 +71,7 @@ class BasicExternalCluster extends Cluster {
   private final Properties tcProperties = new Properties();
   private final Properties systemProperties = new Properties();
   private final String logConfigExt;
+  private final int serverHeapSize;
   private final Supplier<StartupCommandBuilder> startupBuilder;
 
   private String displayName;
@@ -87,7 +88,7 @@ class BasicExternalCluster extends Cluster {
 
   BasicExternalCluster(Path clusterDirectory, int stripeSize, Set<Path> serverJars, String namespaceFragment,
                        String serviceFragment, int clientReconnectWindow, int voterCount, boolean consistentStart, Properties tcProperties,
-                       Properties systemProperties, String logConfigExt, Supplier<StartupCommandBuilder> startupBuilder) {
+                       Properties systemProperties, String logConfigExt, int serverHeapSize, Supplier<StartupCommandBuilder> startupBuilder) {
     if (Files.exists(clusterDirectory)) {
       if (Files.isRegularFile(clusterDirectory)) {
         throw new IllegalArgumentException("Cluster directory is a file: " + clusterDirectory);
@@ -110,6 +111,7 @@ class BasicExternalCluster extends Cluster {
     this.tcProperties.putAll(tcProperties);
     this.systemProperties.putAll(systemProperties);
     this.logConfigExt = logConfigExt;
+    this.serverHeapSize = serverHeapSize;
     this.startupBuilder = startupBuilder;
     this.clientThread = Thread.currentThread();
   }
@@ -184,7 +186,7 @@ private void internalStart() throws Throwable {
     Path kitLocation = installKit(stripeVerboseManager, kitDir, serverJars, stripeInstallationDir);
 
     StripeConfiguration stripeConfig = new StripeConfiguration(serverDebugPorts, serverPorts, serverGroupPorts, serverNames,
-        stripeName, DEFAULT_SERVER_HEAP_MB, logConfigExt, systemProperties);
+        stripeName, serverHeapSize, logConfigExt, systemProperties);
     StripeInstaller stripeInstaller = new StripeInstaller(interlock, stateManager, stripeVerboseManager, stripeConfig);
     // Configure and install each server in the stripe.
     for (int i = 0; i < stripeSize; ++i) {

galvan-support/src/main/java/org/terracotta/testing/rules/BasicExternalClusterBuilder.java

@@ -29,6 +29,7 @@
 import java.util.function.Supplier;
 
 import static org.terracotta.testing.config.ConfigConstants.DEFAULT_CLIENT_RECONNECT_WINDOW;
+import static org.terracotta.testing.config.ConfigConstants.DEFAULT_SERVER_HEAP_MB;
 import static org.terracotta.testing.config.ConfigConstants.DEFAULT_VOTER_COUNT;
 
 public class BasicExternalClusterBuilder {
@@ -44,6 +45,7 @@ public class BasicExternalClusterBuilder {
   private Properties tcProperties = new Properties();
   private Properties systemProperties = new Properties();
   private String logConfigExt = "logback-ext.xml";
+  private int serverHeapSize = DEFAULT_SERVER_HEAP_MB;
   private Supplier<StartupCommandBuilder> startupBuilder = DefaultStartupCommandBuilder::new;
 
   private BasicExternalClusterBuilder(final int stripeSize) {
@@ -127,6 +129,11 @@ public BasicExternalClusterBuilder withSystemProperty(String key, String value)
     return this;
   }
 
+  public BasicExternalClusterBuilder withServerHeap(int heapSize) {
+    this.serverHeapSize = heapSize;
+    return this;
+  }
+
   public BasicExternalClusterBuilder logConfigExtensionResourceName(String logConfigExt) {
     this.logConfigExt = logConfigExt;
     return this;
@@ -144,6 +151,7 @@ public BasicExternalClusterBuilder withConsistentStartup(boolean consistent) {
 
   public Cluster build() {
     return new BasicExternalCluster(clusterDirectory, stripeSize, serverJars, namespaceFragment, serviceFragment,
-        clientReconnectWindowTime, failoverPriorityVoterCount, consistentStart, tcProperties, systemProperties, logConfigExt, startupBuilder);
+        clientReconnectWindowTime, failoverPriorityVoterCount, consistentStart, tcProperties, systemProperties,
+        logConfigExt, serverHeapSize, startupBuilder);
   }
 }