Support Storm 1.0.0+

.travis.yml

@@ -22,10 +22,8 @@ script:
 matrix:
   fast_finish: true
   include:
-  - env: STORM_RELEASE="0.10.1" MESOS_RELEASE="0.28.2"
-  - env: STORM_RELEASE="0.10.1" MESOS_RELEASE="0.27.2"
-  - env: STORM_RELEASE="0.9.6" MESOS_RELEASE="0.28.2" STORM_URL="https://github.com/erikdw/storm/releases/download/v0.9.6-storm-mesos2/apache-storm-0.9.6-storm-mesos2.tar.gz"
-  - env: STORM_RELEASE="0.9.6" MESOS_RELEASE="0.27.2" STORM_URL="https://github.com/erikdw/storm/releases/download/v0.9.6-storm-mesos2/apache-storm-0.9.6-storm-mesos2.tar.gz"
+  - env: STORM_RELEASE="1.0.2" MESOS_RELEASE="1.0.1"
+  - env: STORM_RELEASE="1.0.2" MESOS_RELEASE="0.28.2"
 before_deploy:
 - travis_retry make images
 - travis_retry make images JAVA_PRODUCT_VERSION=8

bin/build-release.sh

@@ -13,10 +13,12 @@ RELEASE=${RELEASE:-`grep -1 -A 0 -B 0 '<version>' pom.xml | head -n 1 | awk '{pr
 
 STORM_RELEASE=${STORM_RELEASE:-`grep -1 -A 0 -B 0 '<storm.default.version>' pom.xml | head -n 1 | awk '{print $1}' | sed -e 's/.*<storm.default.version>//' | sed -e 's/<\/storm.default.version>.*//'`}
 
-if [[ $STORM_RELEASE == "0.10"* ]]; then
+if [[ $STORM_RELEASE == "0.9"* ]]; then
+  PROFILE=storm9
+elif [[ $STORM_RELEASE == "0.10"* ]]; then
   PROFILE=storm10
 else
-  PROFILE=storm9
+  PROFILE=storm1.0
 fi
 
 MESOS_RELEASE=${MESOS_RELEASE:-`grep -1 -A 0 -B 0 '<mesos.default.version>' pom.xml | head -n 1 | awk '{print $1}' | sed -e 's/.*<mesos.default.version>//' | sed -e 's/<\/mesos.default.version>.*//'`}

pom.xml

@@ -16,8 +16,7 @@
 
   <modules>
     <module>storm-shim</module>
-    <module>storm-shim-9x</module>
-    <module>storm-shim-10x</module>
+    <module>storm-shim-1x</module>
     <module>storm</module>
   </modules>
 
@@ -30,28 +29,20 @@
     <!-- These are used by bin/build-release.sh to determine which versions
          should be used by default if MESOS_RELEASE and/or STORM_RELEASE
          are not set. -->
-    <storm.default.version>0.9.6</storm.default.version>
+    <storm.default.version>1.0.2</storm.default.version>
     <mesos.default.version>0.27.0</mesos.default.version>
     <mesos.version>0.27.0</mesos.version>
   </properties>
 
   <profiles>
     <profile>
-      <id>storm9</id>
+      <id>storm1.0</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
       <properties>
-        <storm.version>0.9.6</storm.version>
-        <shim>storm-shim-9x</shim>
-        <snakeyaml.scope>provided</snakeyaml.scope>
-      </properties>
-    </profile>
-    <profile>
-      <id>storm10</id>
-      <properties>
-        <storm.version>0.10.1</storm.version>
-        <shim>storm-shim-10x</shim>
+        <storm.version>1.0.0</storm.version>
+        <shim>storm-shim-1x</shim>
         <snakeyaml.scope>compile</snakeyaml.scope>
       </properties>
     </profile>

storm-shim-9x/pom.xml → storm-shim-1x/pom.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.mesos</groupId>
-  <artifactId>storm-shim-9x</artifactId>
+  <artifactId>storm-shim-1x</artifactId>
   <version>0.1.8-SNAPSHOT</version>
-  <name>storm-shim-9x</name>
-  <description>0.9.x impl shim to ease Storm Version differences</description>
+  <name>storm-shim-1x</name>
+  <description>0.1.x impl shim to ease Storm Version differences</description>
 
   <scm>
     <connection>scm:git:git://github.com/mesos/storm.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/mesos/storm.git</developerConnection>
     <url>https://github.com/mesos/storm</url>
-    <tag>HEAD</tag>
   </scm>
 
   <parent>
@@ -30,8 +31,8 @@
     <dependency>
       <groupId>org.apache.storm</groupId>
       <artifactId>storm-core</artifactId>
+      <version>1.0.0</version>
       <scope>provided</scope>
-      <version>0.9.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.mesos</groupId>

storm-shim-10x/src/main/java/storm/mesos/shims/CommandLineShim.java → storm-shim-1x/src/main/java/storm/mesos/shims/CommandLineShim.java

@@ -30,7 +30,7 @@ public String getCommandLine(String topologyId) {
         "export STORM_SUPERVISOR_LOG_FILE=%s-supervisor.log" +
         " && cp storm.yaml storm-mesos*/conf" +
         " && cd storm-mesos*" +
-        " && python bin/storm.py supervisor storm.mesos.MesosSupervisor%s",
+        " && bin/storm supervisor storm.mesos.MesosSupervisor%s",
         topologyId, extraConfig);
   }
 

storm-shim-9x/src/main/java/storm/mesos/shims/DockerCommandLineShim.java → storm-shim-1x/src/main/java/storm/mesos/shims/DockerCommandLineShim.java

@@ -33,8 +33,9 @@ public String getCommandLine(String topologyId) {
         "export MESOS_NATIVE_JAVA_LIBRARY=%s" +
         " && export STORM_SUPERVISOR_LOG_FILE=%s-supervisor.log" +
         " && /bin/cp $MESOS_SANDBOX/storm.yaml conf " +
-        " && /usr/bin/python bin/storm supervisor storm.mesos.MesosSupervisor " +
+        " && bin/storm supervisor storm.mesos.MesosSupervisor " +
         "-c storm.log.dir=$MESOS_SANDBOX/logs%s",
         javaLibPath, topologyId, extraConfig);
   }
+
 }

storm-shim-10x/src/main/java/storm/mesos/shims/LocalStateShim.java → storm-shim-1x/src/main/java/storm/mesos/shims/LocalStateShim.java

@@ -17,11 +17,11 @@
  */
 package storm.mesos.shims;
 
-import backtype.storm.generated.ComponentObject;
-import backtype.storm.generated.JavaObject;
-import backtype.storm.generated.JavaObjectArg;
-import backtype.storm.utils.LocalState;
-import org.apache.thrift7.TBase;
+import org.apache.storm.generated.ComponentObject;
+import org.apache.storm.generated.JavaObject;
+import org.apache.storm.generated.JavaObjectArg;
+import org.apache.storm.utils.LocalState;
+import org.apache.storm.thrift.TBase;
 
 import java.io.IOException;
 import java.util.ArrayList;

storm.yaml

@@ -18,6 +18,9 @@ topology.mesos.executor.cpu: 0.1
 topology.mesos.executor.mem.mb: 500 # Supervisor memory, with 20% overhead
 supervisor.childopts: "-Xmx400m"
 
+# Configs for Resource Aware Scheduler
+topology.worker.max.heap.size.mb: 768.0  # default max heap size, can be overriden in topologies' configs
+
 # The default behavior is to launch the logviewer unless autostart is false.
 # If you enable the logviewer, you'll need to add memory overhead to the
 # executor for the logviewer.
@@ -37,7 +40,7 @@ supervisor.autostart.logviewer: true
 mesos.container.docker.image: "mesosphere/storm"
 
 # Use Netty to avoid ZMQ dependencies
-storm.messaging.transport: "backtype.storm.messaging.netty.Context"
+storm.messaging.transport: "org.apache.storm.messaging.netty.Context"
 
 storm.local.dir: "storm-local"
 

storm/pom.xml

@@ -187,12 +187,6 @@
       <artifactId>mockito-all</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.mesos</groupId>
       <artifactId>${shim}</artifactId>