fix inline usage

Author: myronkscott

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

@@ -68,6 +68,7 @@ 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;
@@ -89,7 +90,7 @@ 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,
+      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)) {
@@ -108,6 +109,7 @@ 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;
@@ -222,6 +224,8 @@ 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);
 
@@ -240,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,7 +200,7 @@ 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,
+            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

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");
   }
 }