Merge pull request #1370 from myronkscott/fix_galvan

fix galvan to be more flexible in alternate uses

Author: myronkscott

galvan-support/src/main/java/org/terracotta/testing/config/DefaultStartupCommandBuilder.java

@@ -27,7 +27,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-import org.terracotta.testing.api.ConfigBuilder;
+import org.terracotta.testing.common.Assert;
 
 public class DefaultStartupCommandBuilder implements StartupCommandBuilder, Cloneable {
   private StripeConfiguration stripeConfig;
@@ -38,10 +38,7 @@ public class DefaultStartupCommandBuilder implements StartupCommandBuilder, Clon
   private String stripeName;
   private String[] builtCommand;
 
-  private final ConfigBuilder builder;
-
-  public DefaultStartupCommandBuilder(ConfigBuilder builder) {
-      this.builder = builder;
+  public DefaultStartupCommandBuilder() {
   }
 
   public DefaultStartupCommandBuilder copy() {
@@ -89,12 +86,8 @@ public StartupCommandBuilder logConfigExtension(String logConfigExt) {
   }
 
   protected Path installServer() throws IOException {
-    // Create a copy of the server for this installation.
-    Files.createDirectories(stripeWorkingDir);
-    Files.createDirectories(serverWorkingDir);
-    // build the tc-config file
-    builder.withStripeConfiguration(stripeConfig);
-    Path tcConfig = builder.createConfig(stripeWorkingDir);
+    Path tcConfig = stripeWorkingDir.resolve("tc-config.xml");
+    Assert.assertTrue(tcConfig.toFile().exists());
     //Copy a custom logback configuration
     Files.copy(this.getClass().getResourceAsStream("/tc-logback.xml"), serverWorkingDir.resolve("logback-test.xml"), REPLACE_EXISTING);
     Properties props = new Properties();

galvan-support/src/main/java/org/terracotta/testing/master/BasicHarnessEntry.java

@@ -71,7 +71,7 @@ protected void runOneConfiguration(VerboseManager verboseManager, DebugOptions d
 
     String stripeName = "stripe1";
     Path stripeInstallationDir = harnessOptions.configTestDir.resolve(stripeName);
-    Files.createDirectory(stripeInstallationDir);
+    Files.createDirectories(stripeInstallationDir);
 
     VerboseManager stripeVerboseManager = verboseManager.createComponentManager("[" + stripeName + "]");
 
@@ -84,7 +84,14 @@ protected void runOneConfiguration(VerboseManager verboseManager, DebugOptions d
     TestStateManager stateManager = new TestStateManager();
     StateInterlock interlock = new StateInterlock(verboseManager.createComponentManager("[Interlock]").createHarnessLogger(), stateManager);
     StripeInstaller stripeInstaller = new StripeInstaller(interlock, stateManager, stripeVerboseManager);
-    // Configure and install each server in the stripe.
+
+    DefaultLegacyConfigBuilder config = new DefaultLegacyConfigBuilder();
+    config.withNamespaceFragment(harnessOptions.namespaceFragment);
+    config.withServiceFragment(harnessOptions.serviceFragment);
+    config.withStripeConfiguration(stripeConfig);
+    Path tcConfig = config.createConfig(stripeInstallationDir);
+
+// Configure and install each server in the stripe.
     for (int i = 0; i < stripeSize; ++i) {
       String serverName = stripeConfig.getServerNames().get(i);
       Path serverWorkingDir = stripeInstallationDir.resolve(serverName);
@@ -94,10 +101,9 @@ protected void runOneConfiguration(VerboseManager verboseManager, DebugOptions d
               "\nkitLocationRelative:" + kitLocationRelative);
       // Determine if we want a debug port.
       int debugPort = stripeConfig.getServerDebugPorts().get(i);
-      DefaultLegacyConfigBuilder config = new DefaultLegacyConfigBuilder();
-      config.withNamespaceFragment(harnessOptions.namespaceFragment);
-      config.withServiceFragment(harnessOptions.serviceFragment);
-      StartupCommandBuilder builder = new DefaultStartupCommandBuilder(config)
+
+      Files.createDirectories(serverWorkingDir);
+      StartupCommandBuilder builder = new DefaultStartupCommandBuilder()
           .stripeConfiguration(stripeConfig)
           .serverName(serverName)
           .stripeName(stripeName)

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

@@ -45,6 +45,7 @@
 import java.util.function.Supplier;
 import static java.util.stream.Collectors.toList;
 import java.util.stream.IntStream;
+import org.terracotta.testing.api.ConfigBuilder;
 import org.terracotta.testing.common.Assert;
 import org.terracotta.testing.config.ClusterInfo;
 import org.terracotta.testing.master.InlineServer;
@@ -67,11 +68,13 @@ public class BasicExternalCluster extends Cluster {
   private final int reconnectWindow;
   private final int voters;
   private final boolean consistent;
+  private final boolean inline;
 
   private final String logConfigExt;
   private final int serverHeapSize;
   private final int serverDebugPortStart;
   private final OutputStream parentOutput;
+  private final ConfigBuilder configBuilder;
   private final Supplier<StartupCommandBuilder> startupBuilder;
 
   private String displayName;
@@ -87,8 +90,8 @@ public class BasicExternalCluster extends Cluster {
   private boolean isSafe;
 
   public BasicExternalCluster(Path clusterDirectory, int stripeSize, Path server, int serverHeapSize,
-      Properties systemProperties, Properties tcProps, int reconnect, int voters, boolean consistent, int serverDebugPort,
-      String logConfigExt, OutputStream parentOutput, Supplier<StartupCommandBuilder> startupBuilder) {
+      Properties systemProperties, Properties tcProps, int reconnect, int voters, boolean consistent, boolean inline, int serverDebugPort,
+      String logConfigExt, OutputStream parentOutput, ConfigBuilder config, Supplier<StartupCommandBuilder> startupBuilder) {
     boolean didCreateDirectories = clusterDirectory.toFile().mkdirs();
     if (Files.exists(clusterDirectory)) {
       if (Files.isRegularFile(clusterDirectory)) {
@@ -106,10 +109,12 @@ public BasicExternalCluster(Path clusterDirectory, int stripeSize, Path server,
     this.reconnectWindow = reconnect;
     this.voters = voters;
     this.consistent = consistent;
+    this.inline = inline;
     this.serverDebugPortStart = serverDebugPort;
     this.logConfigExt = logConfigExt;
     this.serverHeapSize = serverHeapSize;
     this.parentOutput = parentOutput;
+    this.configBuilder = config;
     this.startupBuilder = startupBuilder;
     this.clientThread = Thread.currentThread();
   }
@@ -208,7 +213,7 @@ private void internalStart(CompletableFuture<Void> checker) throws Throwable {
 
     String stripeName = "stripe1";
     Path stripeInstallationDir = testParentDir.toPath().resolve(stripeName);
-    Files.createDirectory(stripeInstallationDir);
+    Files.createDirectories(stripeInstallationDir);
 
     VerboseManager stripeVerboseManager = displayVerboseManager.createComponentManager("[" + stripeName + "]");
 
@@ -219,10 +224,15 @@ private void internalStart(CompletableFuture<Void> checker) throws Throwable {
 
     // Configure and install each server in the stripe.
     System.setProperty("tc.install-root", server.toString());
+    systemProperties.setProperty("tc.install-root", server.toString());
+    
+    configBuilder.withStripeConfiguration(stripeConfig);
+    Path tcConfig = configBuilder.createConfig(stripeInstallationDir);
 
     for (int i = 0; i < stripeSize; ++i) {
       String serverName = serverNames.get(i);
       Path serverWorkingDir = stripeInstallationDir.resolve(serverName);
+      Files.createDirectories(serverWorkingDir);
       // Determine if we want a debug port.
       int debugPort = stripeConfig.getServerDebugPorts().get(i);
 
@@ -234,11 +244,7 @@ private void internalStart(CompletableFuture<Void> checker) throws Throwable {
           .serverWorkingDir(serverWorkingDir)
           .logConfigExtension(logConfigExt);
 
-      if (serverHeapSize <= 0) {
-        System.setProperty("com.tc.tc.messages.packup.enabled", "false");
-      }
-
-      ServerInstance serverProcess = serverHeapSize > 0 ?
+      ServerInstance serverProcess = !inline ?
         new ServerProcess(serverName, server, serverWorkingDir, serverHeapSize, debugPort, systemProperties, parentOutput, builder.build())
               :
         new InlineServer(serverName, server, serverWorkingDir, systemProperties, parentOutput, builder.build());

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

@@ -45,10 +45,10 @@ public class BasicExternalClusterBuilder {
   private int reconnectWindow = ConfigConstants.DEFAULT_CLIENT_RECONNECT_WINDOW;
   private int voters = ConfigConstants.DEFAULT_VOTER_COUNT;
   private boolean consistent = false;
+  private boolean inline = true;
 
   private String logConfigExt = "logback-ext.xml";
   private int serverHeapSize = DEFAULT_SERVER_HEAP_MB;
-  private int customHeapSize = DEFAULT_SERVER_HEAP_MB;
   private ConfigBuilder configBuilder;
   private ServerDeploymentBuilder serverBuilder = new ServerDeploymentBuilder();
   private Supplier<StartupCommandBuilder> startupBuilder;
@@ -138,7 +138,6 @@ public BasicExternalClusterBuilder withSystemProperty(String key, String value)
 
   public BasicExternalClusterBuilder withServerHeap(int heapSize) {
     this.serverHeapSize = heapSize;
-    this.customHeapSize = heapSize;
     return this;
   }
 
@@ -163,11 +162,11 @@ public BasicExternalClusterBuilder startupBuilder(Supplier<StartupCommandBuilder
   }
 
   public BasicExternalClusterBuilder inline(boolean yes) {
+    inline = yes;
     if (yes) {
       this.serverHeapSize = -1;
       tcProperties.put("tc.messages.packup.enabled", false);
     } else {
-      this.serverHeapSize = customHeapSize;
       tcProperties.put("tc.messages.packup.enabled", true);
     }
     return this;
@@ -201,9 +200,9 @@ public Cluster build() {
     int serverDebugStartPort = debugPortString != null ? Integer.parseInt(debugPortString) : 0;
 
     return new BasicExternalCluster(clusterDirectory, stripeSize, this.serverBuilder.deploy(), serverHeapSize, systemProperties, tcProperties,
-            this.reconnectWindow, this.voters, this.consistent, serverDebugStartPort,
-        logConfigExt, parentStream,
-            Optional.ofNullable(startupBuilder).orElse(()-> new DefaultStartupCommandBuilder(Optional.ofNullable(configBuilder).orElse(new DefaultLegacyConfigBuilder()))));
+            this.reconnectWindow, this.voters, this.consistent, this.inline, serverDebugStartPort,
+        logConfigExt, parentStream,Optional.ofNullable(configBuilder).orElse(new DefaultLegacyConfigBuilder()),
+            Optional.ofNullable(startupBuilder).orElse(DefaultStartupCommandBuilder::new));
 
   }
 }

galvan-support/src/test/java/org/terracotta/functional/ExtendedServerIT.java

@@ -31,12 +31,9 @@
  *
  */
 public class ExtendedServerIT {
-  static {
-    System.setProperty("tc.server-jar", "extended-server");
-  }
-  
   @Rule
   public final Cluster CLUSTER = BasicExternalClusterBuilder.newCluster(1).withClientReconnectWindowTime(30)
+      .inline(false)
       .build();
 
   @Test

galvan-support/src/test/java/org/terracotta/functional/ReflectorFunctionIT.java

@@ -37,7 +37,7 @@ public class ReflectorFunctionIT {
   @Rule
   public final Cluster CLUSTER = BasicExternalClusterBuilder.newCluster(2)
           .inline(false)
-          .startupBuilder(()->new DefaultStartupCommandBuilder(new DefaultLegacyConfigBuilder()) {
+          .startupBuilder(()->new DefaultStartupCommandBuilder() {
             @Override
             public String[] build() {
               List<String> def = new ArrayList<>();

server-bootstrap/src/main/java/com/tc/server/Directories.java

@@ -93,18 +93,21 @@ public static Path getServerJar() throws FileNotFoundException {
     if (jar == null) {
       jar = "tc-server.*\\.jar";
     }
-    Path jarFile = searchForServerJar(getInstallationRoot(), jar);
-    
-    return jarFile;
+    Path path = getInstallationRoot();
+    try {
+      return searchForServerJar(path, jar);
+    } catch (NoSuchElementException no) {
+      throw new FileNotFoundException("searching:" + path + " jar:" + jar);
+    }
   }
 
-  private static Path searchForServerJar(Path directory, String name) {
+  private static Path searchForServerJar(Path directory, String name) throws NoSuchElementException {
     try {
       Optional<Path> possible = Files.find(directory, 5, (path, o)->{
         return path.getFileName().toString().matches(name); }
       ).findAny();
-      return possible.orElse(null);
-    } catch (IOException | NoSuchElementException io) {
+      return possible.orElseThrow();
+    } catch (IOException io) {
       return null;
     }
   }

terracotta/src/main/java/com/tc/server/TCServerMain.java

@@ -60,18 +60,15 @@ public static Future<Boolean> createServer(List<String> args, OutputStream conso
     try {
       Path serverJar = Directories.getServerJar();
 
-      if (serverJar != null) {
-        ClassLoader serverClassLoader = new URLClassLoader(new URL[] {serverJar.toUri().toURL()}, TCServerMain.class.getClassLoader());
+      ClassLoader serverClassLoader = new URLClassLoader(new URL[] {serverJar.toUri().toURL()}, TCServerMain.class.getClassLoader());
 
-        return ServerFactory.createServer(args, console, serverClassLoader);
-      }
+      return ServerFactory.createServer(args, console, serverClassLoader);
     } catch (RuntimeException t) {
       throw t;
     } catch (IOException io) {
       throw new UncheckedIOException(io);
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
-    throw new RuntimeException("server libraries not found");
   }
 }