Fix libmesos (#393)

* Upgraded libmesos bundle to 1.8.7-1.0.2-2 * Fixed LD_LIBRARY_PATH * Fixed ClusterTaskOfferRequirementProviderTest, which assumes a certain ordering of the URIs. * Sorted the test URIs.
mesosphere-backup · Feb 2, 2017 · ebde7d0 · ebde7d0
1 parent 90bb4f4
commit ebde7d0
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 21 deletions.
diff --git a/...s/src/test/java/com/mesosphere/dcos/cassandra/common/config/ConfigurationManagerTest.java b/...s/src/test/java/com/mesosphere/dcos/cassandra/common/config/ConfigurationManagerTest.java
@@ -243,7 +243,7 @@ public void serializeDeserializeExecutorConfig() throws Exception {
                 (CassandraSchedulerConfiguration)configurationManager.getTargetConfig();
 
         ExecutorConfig expectedExecutorConfig = new ExecutorConfig(
-                "export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && ./executor/bin/cassandra-executor server executor/conf/executor.yml",
+                "export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && ./executor/bin/cassandra-executor server executor/conf/executor.yml",
                 new ArrayList<>(),
                 0.1,
                 768,
@@ -253,7 +253,7 @@ public void serializeDeserializeExecutorConfig() throws Exception {
                 URI.create("https://downloads.mesosphere.com/java/jre-8u121-linux-x64.tar.gz"),
                 URI.create("https://s3-us-west-2.amazonaws.com/cassandra-framework-dev/testing/executor.zip"),
                 URI.create("https://s3-us-west-2.amazonaws.com/cassandra-framework-dev/testing/apache-cassandra-2.2.5-bin.tar.gz"),
-                URI.create("http://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.8.7-1.0.2.tar.gz"),
+                URI.create("http://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.8.7-1.0.2-2.tar.gz"),
                 false);
 
         manager.start();

diff --git a/cassandra-commons/src/test/resources/scheduler.yml b/cassandra-commons/src/test/resources/scheduler.yml
@@ -1,5 +1,5 @@
 executor:
-  command : ${EXECUTOR_COMMAND:-"export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && ./executor/bin/cassandra-executor server executor/conf/executor.yml"}
+  command : ${EXECUTOR_COMMAND:-"export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && ./executor/bin/cassandra-executor server executor/conf/executor.yml"}
   arguments : ${EXECUTOR_ARGS:-[]}
   cpus : ${EXECUTOR_CPUS:-0.1}
   memory_mb : ${EXECUTOR_MEMORY_MB:-768}
@@ -9,7 +9,7 @@ executor:
   jre_location : ${EXECUTOR_JRE_LOCATION:-'https://downloads.mesosphere.com/java/jre-8u121-linux-x64.tar.gz'}
   executor_location : ${EXECUTOR_LOCATION:-'https://s3-us-west-2.amazonaws.com/cassandra-framework-dev/testing/executor.zip'}
   cassandra_location : ${EXECUTOR_CASSANDRA_LOCATION:-'https://s3-us-west-2.amazonaws.com/cassandra-framework-dev/testing/apache-cassandra-2.2.5-bin.tar.gz'}
-  libmesos_location: ${EXECUTOR_LIBMESOS_LOCATION:-'http://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.8.7-1.0.2.tar.gz'}
+  libmesos_location: ${EXECUTOR_LIBMESOS_LOCATION:-'http://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.8.7-1.0.2-2.tar.gz'}
   cache_fetched_uris: ${EXECUTOR_CACHE_FETCHED_URIS:-false}
 cluster_task:
   cpus: ${CLUSTER_TASK_CPUS:-1}

diff --git a/cassandra-executor/src/test/resources/scheduler.yml b/cassandra-executor/src/test/resources/scheduler.yml
@@ -1,5 +1,5 @@
 executor:
-  command : ${EXECUTOR_COMMAND:-"export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && ./executor/bin/cassandra-executor server executor/conf/executor.yml"}
+  command : ${EXECUTOR_COMMAND:-"export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && ./executor/bin/cassandra-executor server executor/conf/executor.yml"}
   arguments : ${EXECUTOR_ARGS:-[]}
   cpus : ${EXECUTOR_CPUS:-0.1}
   memory_mb : ${EXECUTOR_MEMORY_MB:-768}
@@ -9,7 +9,7 @@ executor:
   jre_location : ${EXECUTOR_JRE_LOCATION:-'https://downloads.mesosphere.com/java/jre-8u121-linux-x64.tar.gz'}
   executor_location : ${EXECUTOR_LOCATION:-'https://s3-us-west-2.amazonaws.com/cassandra-framework-dev/testing/executor.zip'}
   cassandra_location : ${EXECUTOR_CASSANDRA_LOCATION:-'https://s3-us-west-2.amazonaws.com/cassandra-framework-dev/testing/apache-cassandra-2.2.5-bin.tar.gz'}
-  libmesos_location: ${EXECUTOR_LIBMESOS_LOCATION:-'http://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.8.7-1.0.2.tar.gz'}
+  libmesos_location: ${EXECUTOR_LIBMESOS_LOCATION:-'http://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.8.7-1.0.2-2.tar.gz'}
   cache_fetched_uris: ${EXECUTOR_CACHE_FETCHED_URIS:-false}
 cluster_task:
   cpus: ${CLUSTER_TASK_CPUS:-1}

diff --git a/cassandra-scheduler/src/dist/conf/scheduler.yml b/cassandra-scheduler/src/dist/conf/scheduler.yml
@@ -1,5 +1,5 @@
 executor:
-  command : ${EXECUTOR_COMMAND:-"export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && ./executor/bin/cassandra-executor server executor/conf/executor.yml"}
+  command : ${EXECUTOR_COMMAND:-"export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && ./executor/bin/cassandra-executor server executor/conf/executor.yml"}
   arguments : ${EXECUTOR_ARGS:-[]}
   cpus : ${EXECUTOR_CPUS:-0.1}
   memory_mb : ${EXECUTOR_MEMORY_MB:-768}
@@ -9,7 +9,7 @@ executor:
   jre_location : ${EXECUTOR_JRE_LOCATION:-'https://downloads.mesosphere.com/java/jre-8u121-linux-x64.tar.gz'}
   executor_location : ${EXECUTOR_LOCATION:-'https://s3-us-west-2.amazonaws.com/cassandra-framework-dev/testing/executor.zip'}
   cassandra_location : ${EXECUTOR_CASSANDRA_LOCATION:-'https://s3-us-west-2.amazonaws.com/cassandra-framework-dev/testing/apache-cassandra-2.2.5-bin.tar.gz'}
-  libmesos_location: ${EXECUTOR_LIBMESOS_LOCATION:-'http://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.8.7-1.0.2.tar.gz'}
+  libmesos_location: ${EXECUTOR_LIBMESOS_LOCATION:-'http://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.8.7-1.0.2-2.tar.gz'}
   cache_fetched_uris: ${EXECUTOR_CACHE_FETCHED_URIS:-false}
 cluster_task:
   cpus: ${CLUSTER_TASK_CPUS:-1}

diff --git a/...a/com/mesosphere/dcos/cassandra/common/offer/ClusterTaskOfferRequirementProviderTest.java b/...a/com/mesosphere/dcos/cassandra/common/offer/ClusterTaskOfferRequirementProviderTest.java
@@ -26,6 +26,7 @@
 import org.junit.*;
 import org.mockito.Mockito;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -235,18 +236,21 @@ public void testGetNewOfferRequirement() throws Exception {
 
         Protos.CommandInfo cmd = executorInfo.getCommand();
         Assert.assertEquals(4, cmd.getUrisList().size());
-        Assert.assertEquals(
-            config.getExecutorConfig().getExecutorLocation().toString(),
-            cmd.getUrisList().get(0).getValue());
-        Assert.assertEquals(
-            config.getExecutorConfig().getCassandraLocation().toString(),
-            cmd.getUrisList().get(1).getValue());
+
+        List<Protos.CommandInfo.URI> urisList = new ArrayList<>(cmd.getUrisList());
+        urisList.sort((a, b) -> a.getValue().compareTo(b.getValue()));
         Assert.assertEquals(
             config.getExecutorConfig().getLibmesosLocation().toString(),
-            cmd.getUrisList().get(2).getValue());
+            urisList.get(0).getValue());
         Assert.assertEquals(
             config.getExecutorConfig().getJreLocation().toString(),
-            cmd.getUrisList().get(3).getValue());
+            urisList.get(1).getValue());
+        Assert.assertEquals(
+            config.getExecutorConfig().getCassandraLocation().toString(),
+            urisList.get(2).getValue());
+        Assert.assertEquals(
+            config.getExecutorConfig().getExecutorLocation().toString(),
+            urisList.get(3).getValue());
     }
 
     @Test

diff --git a/cassandra-scheduler/src/test/resources/scheduler.yml b/cassandra-scheduler/src/test/resources/scheduler.yml
@@ -1,5 +1,5 @@
 executor:
-  command : ${EXECUTOR_COMMAND:-"export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && ./executor/bin/cassandra-executor server executor/conf/executor.yml"}
+  command : ${EXECUTOR_COMMAND:-"export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && ./executor/bin/cassandra-executor server executor/conf/executor.yml"}
   arguments : ${EXECUTOR_ARGS:-[]}
   cpus : ${EXECUTOR_CPUS:-0.1}
   memory_mb : ${EXECUTOR_MEMORY_MB:-768}
@@ -9,7 +9,7 @@ executor:
   jre_location : ${EXECUTOR_JRE_LOCATION:-'https://downloads.mesosphere.com/java/jre-8u121-linux-x64.tar.gz'}
   executor_location : ${EXECUTOR_LOCATION:-'https://s3-us-west-2.amazonaws.com/cassandra-framework-dev/testing/executor.zip'}
   cassandra_location : ${EXECUTOR_CASSANDRA_LOCATION:-'https://s3-us-west-2.amazonaws.com/cassandra-framework-dev/testing/apache-cassandra-2.2.5-bin.tar.gz'}
-  libmesos_location: ${EXECUTOR_LIBMESOS_LOCATION:-'http://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.8.7-1.0.2.tar.gz'}
+  libmesos_location: ${EXECUTOR_LIBMESOS_LOCATION:-'http://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.8.7-1.0.2-2.tar.gz'}
 cluster_task:
   cpus: ${CLUSTER_TASK_CPUS:-1}
   memory_mb: ${CLUSTER_TASK_MEMORY_MB:-256}

diff --git a/cassandra-scheduler/src/test/resources/update-scheduler.yml b/cassandra-scheduler/src/test/resources/update-scheduler.yml
@@ -1,5 +1,5 @@
 executor:
-  command : ${EXECUTOR_COMMAND:-"export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) &&  ./executor/bin/cassandra-executor server executor/conf/executor.yml"}
+  command : ${EXECUTOR_COMMAND:-"export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) &&  ./executor/bin/cassandra-executor server executor/conf/executor.yml"}
   arguments : ${EXECUTOR_ARGS:-[]}
   cpus : ${EXECUTOR_CPUS:-0.1}
   memory_mb : ${EXECUTOR_MEMORY_MB:-768}
@@ -9,7 +9,7 @@ executor:
   jre_location : ${EXECUTOR_JRE_LOCATION:-'https://downloads.mesosphere.com/java/jre-8u121-linux-x64.tar.gz'}
   executor_location : ${EXECUTOR_LOCATION:-'https://s3-us-west-2.amazonaws.com/cassandra-framework-dev/testing/executor.zip'}
   cassandra_location : ${EXECUTOR_CASSANDRA_LOCATION:-'https://s3-us-west-2.amazonaws.com/cassandra-framework-dev/testing/apache-cassandra-2.2.5-bin-updated.tar.gz'}
-  libmesos_location: ${EXECUTOR_LIBMESOS_LOCATION:-'http://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.8.7-1.0.2.tar.gz'}
+  libmesos_location: ${EXECUTOR_LIBMESOS_LOCATION:-'http://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.8.7-1.0.2-2.tar.gz'}
   cache_fetched_uris: ${EXECUTOR_CACHE_FETCHED_URIS:-false}
 cluster_task:
   cpus: ${CLUSTER_TASK_CPUS:-1}

diff --git a/universe/marathon.json.mustache b/universe/marathon.json.mustache
@@ -1,6 +1,6 @@
 {
   "id": "/{{service.name}}",
-  "cmd": "env && export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && env && ./scheduler/bin/cassandra-scheduler server ./scheduler/conf/scheduler.yml",
+  "cmd": "env && export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH && export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so) && env && ./scheduler/bin/cassandra-scheduler server ./scheduler/conf/scheduler.yml",
   "instances": 1,
   "cpus": {{service.cpus}},
   "mem": {{service.mem}},