Removing DW and moving to Chaos.

bin/chronos-marathon

@@ -1,9 +1,16 @@
 #!/bin/bash
+set -o errexit -o nounset -o pipefail
+set -x
 
 export JAVA_LIBRARY_PATH="/usr/local/lib:/lib:/usr/lib"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$JAVA_LIBRARY_PATH"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-/lib}"
+export LD_LIBRARY_PATH="$JAVA_LIBRARY_PATH:$LD_LIBRARY_PATH"
+export PORT0="${PORT0:-4400}"
+export PORT1="${PORT1:-4401}"
+
 config="$1"
-jar_file="$2"
+# Find the largest chronos-jar file in the directory (i.e. the all-encompassing jar file)
+jar_file=$(find . -name "chronos*.jar"  -exec ls -l -S {} \;  | sort -k 5 -n | tail -n1 | awk '{ print $9 }')
 mesos_master="$( < /etc/mesos/zk)"
 tmp="${mesos_master//zk:\/\/}"
 zk_host="${tmp/\/*}"

config/README.md

@@ -209,7 +209,7 @@ Enable checkpointing for this framework on Mesos
 
 The Mesos framework name to register with.
 
-*Default*: `"chronos" + System.currentTimeMillis()` (ex. `chronos1381601474269`)
+*Default*: `"chronos-<VERSION>"
 
 ### scheduleHorizonSeconds
 
@@ -276,7 +276,7 @@ We have included sample configuration files for local Chronos development as wel
 [`sample_scheduler.yml`](#sample_scheduleryml)
 
 ## `local_cluster_scheduler.yml`
-This configuration file assumes you have a mesos slave and master running locally. 
+This configuration file assumes you have a mesos slave and master running locally.
 
 ## `local_cluster_asset_dev.yml`
 This configuration file is the same as the above ([`local_cluster_scheduler.yml`](#local_cluster_scheduleryml)), but also specifies asset overrides. Asset overrides should only be in your configuration file if you are modifying assets locally. If asset overrides are present in your production config, you will be unable to use the UI, as unpackaged assets are not included in the jar.

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.airbnb</groupId>
     <artifactId>chronos</artifactId>
-    <version>1.0.0_mesos-0.14.0-rc4</version>
+    <version>2.0.1_mesos-0.14.0-rc4</version>
     <inceptionYear>2012</inceptionYear>
 
     <prerequisites>
@@ -17,21 +17,20 @@
 
         <!-- language versions -->
         <java.abi>1.6</java.abi>
-        <scala.version>2.9.1</scala.version>
-        <scala.abi>2.9.1</scala.abi>
+        <scala.version>2.10.2</scala.version>
+        <scala.abi>2.10.2</scala.abi>
 
         <!-- runtime deps versions -->
+        <chaos.version>0.4.3</chaos.version>
+        <mesos-utils.version>0.0.4</mesos-utils.version>
         <commons-math3.version>3.2</commons-math3.version>
-        <dropwizard.version>0.6.2</dropwizard.version>
-        <dropwizard.configurable-assets-bundle.version>0.1.10</dropwizard.configurable-assets-bundle.version>
         <guava.version>14.0.1</guava.version>
         <guice.version>3.0</guice.version>
         <jgrapht.version>0.8.3</jgrapht.version>
         <joda-convert.version>1.3.1</joda-convert.version>
         <joda-time.version>2.2</joda-time.version>
         <mesos.version>0.14.1-SNAPSHOT</mesos.version>
         <protobuf.version>2.4.1</protobuf.version>
-        <yammer-metrics.version>2.2.0</yammer-metrics.version>
         <twitter-commons.version>0.0.44</twitter-commons.version>
 
         <!-- test deps versions -->
@@ -100,6 +99,17 @@
             <artifactId>mesos</artifactId>
             <version>${mesos.version}</version>
         </dependency>
+        <dependency>
+            <groupId>mesosphere</groupId>
+            <artifactId>chaos</artifactId>
+            <version>${chaos.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>mesosphere</groupId>
+            <artifactId>mesos-utils</artifactId>
+            <version>${mesos-utils.version}</version>
+        </dependency>
 
         <!-- Everything else -->
         <dependency>
@@ -127,37 +137,7 @@
             <artifactId>joda-convert</artifactId>
             <version>${joda-convert.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.yammer.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-            <version>${yammer-metrics.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yammer.metrics</groupId>
-            <artifactId>metrics-ganglia</artifactId>
-            <version>${yammer-metrics.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yammer.metrics</groupId>
-            <artifactId>metrics-guice</artifactId>
-            <version>${yammer-metrics.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yammer.dropwizard</groupId>
-            <artifactId>dropwizard-core</artifactId>
-            <version>${dropwizard.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yammer.dropwizard</groupId>
-            <artifactId>dropwizard-scala_${scala.abi}</artifactId>
-            <version>${dropwizard.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.bazaarvoice.dropwizard</groupId>
-            <artifactId>dropwizard-configurable-assets-bundle</artifactId>
-            <version>${dropwizard.configurable-assets-bundle.version}</version>
-        </dependency>
-        <dependency>
+       <dependency>
             <groupId>net.sf.jgrapht</groupId>
             <artifactId>jgrapht</artifactId>
             <version>${jgrapht.version}</version>
@@ -173,6 +153,7 @@
             <version>0.0.37</version>
         </dependency>
 
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-email</artifactId>

src/main/scala/com/airbnb/scheduler/config/MainModule.scala

@@ -10,12 +10,13 @@ import com.airbnb.scheduler.jobs.{JobMetrics, TaskManager, JobScheduler}
 import com.airbnb.scheduler.graph.JobGraph
 import com.airbnb.scheduler.state.PersistenceStore
 import com.airbnb.notification.MailClient
-import com.google.inject.{Provides, Singleton, Inject, AbstractModule}
+import com.google.inject.{Inject, Provides, Singleton, AbstractModule}
 import com.google.common.util.concurrent.{ListeningScheduledExecutorService, ThreadFactoryBuilder, MoreExecutors}
 import com.twitter.common.zookeeper.Candidate
-import org.apache.mesos.Protos.{FrameworkID, FrameworkInfo}
+import org.apache.mesos.Protos.FrameworkInfo
 import org.apache.mesos.Scheduler
 import org.joda.time.Seconds
+import mesosphere.mesos.util.FrameworkIdUtil
 
 /**
  * Guice glue code of application logic components.
@@ -28,18 +29,6 @@ class MainModule(val config: SchedulerConfiguration) extends AbstractModule {
     log.info("Wiring up the application")
 
     bind(classOf[Scheduler]).to(classOf[MesosJobFramework]).asEagerSingleton()
-    bind(classOf[FrameworkInfo]).toInstance(
-      FrameworkInfo.newBuilder()
-        .setName(config.mesosFrameworkName)
-        .setCheckpoint(config.mesosCheckpoint)
-        .setRole(config.mesosRole)
-        .setId(
-          FrameworkID.newBuilder()
-            .setValue("chronos").build()
-          )
-        .setFailoverTimeout(config.failoverTimeoutSeconds).setUser(config.user).build()
-    )
-
     bind(classOf[SchedulerHealthCheck]).asEagerSingleton()
     bind(classOf[TaskManager]).asEagerSingleton()
     bind(classOf[SchedulerConfiguration]).toInstance(config)
@@ -48,6 +37,20 @@ class MainModule(val config: SchedulerConfiguration) extends AbstractModule {
     bind(classOf[JobGraph]).asEagerSingleton()
   }
 
+  @Inject
+  @Singleton
+  @Provides
+  def provideFrameworkInfo(frameworkIdUtil: FrameworkIdUtil): FrameworkInfo = {
+    val frameworkInfo = FrameworkInfo.newBuilder()
+      .setName(config.mesosFrameworkName)
+      .setCheckpoint(config.mesosCheckpoint)
+      .setRole(config.mesosRole)
+      .setFailoverTimeout(config.failoverTimeoutSeconds).setUser(config.user)
+    frameworkIdUtil.setIdIfExists(frameworkInfo)
+    frameworkInfo.build()
+  }
+
+
   @Singleton
   @Provides
   def provideMesosSchedulerDriverFactory(mesosScheduler: Scheduler, frameworkInfo: FrameworkInfo): MesosDriverFactory =
@@ -56,13 +59,13 @@ class MainModule(val config: SchedulerConfiguration) extends AbstractModule {
   @Singleton
   @Provides
   def provideTaskScheduler(
-      taskManager: TaskManager,
-      dependencyScheduler: JobGraph,
-      persistenceStore: PersistenceStore,
-      mesosSchedulerDriver: MesosDriverFactory,
-      candidate: Candidate,
-      mailClient: Option[MailClient],
-      metrics: JobMetrics): JobScheduler = {
+                            taskManager: TaskManager,
+                            dependencyScheduler: JobGraph,
+                            persistenceStore: PersistenceStore,
+                            mesosSchedulerDriver: MesosDriverFactory,
+                            candidate: Candidate,
+                            mailClient: Option[MailClient],
+                            metrics: JobMetrics): JobScheduler = {
     new JobScheduler(Seconds.seconds(config.scheduleHorizonSeconds).toPeriod, taskManager,
       dependencyScheduler, persistenceStore, mesosSchedulerDriver, candidate, mailClient,
       config.failureRetryDelay, config.disableAfterFailures, metrics)

src/main/scala/com/airbnb/scheduler/config/SchedulerConfiguration.scala

@@ -98,7 +98,7 @@ class SchedulerConfiguration extends Configuration with AssetsBundleConfiguratio
   val mesosRole: String = "*"
 
   @JsonProperty
-  val mesosFrameworkName: String = "chronos%d".format(System.currentTimeMillis())
+  val mesosFrameworkName: String = "chronos-1.0.1"
 
   @JsonProperty
   val gangliaHostPort: Option[String] = None

src/main/scala/com/airbnb/scheduler/config/ZookeeperModule.scala

@@ -11,10 +11,11 @@ import com.twitter.common.base.Supplier
 import com.twitter.common.quantity.Amount
 import com.twitter.common.quantity.Time
 import com.twitter.common.zookeeper._
-import org.apache.mesos.state.ZooKeeperState
+import org.apache.mesos.state.{State, ZooKeeperState}
 import org.apache.zookeeper.ZooDefs
 import org.apache.zookeeper.server.{NIOServerCnxn, ZooKeeperServer}
 import java.io.File
+import mesosphere.mesos.util.FrameworkIdUtil
 
 /**
  * Guice glue-code for zookeeper related things.
@@ -37,11 +38,28 @@ class ZookeeperModule(val config: SchedulerConfiguration) extends AbstractModule
   @Inject
   @Singleton
   @Provides
-  def providePersistencStore(zk: ZooKeeperClient): PersistenceStore = {
-    log.info("Providing MesosStatePersistenceStore")
-    ZooKeeperUtils.ensurePath(zk, ZooDefs.Ids.OPEN_ACL_UNSAFE, config.zookeeperStateZnode)
-    new MesosStatePersistenceStore(zk, config, new ZooKeeperState(
-      getZkServerString, config.zookeeperTimeoutMs, TimeUnit.MILLISECONDS, config.zookeeperStateZnode))
+  def provideState(): State = {
+    new ZooKeeperState(getZkServerString,
+                       config.zookeeperTimeoutMs,
+                       TimeUnit.MILLISECONDS,
+                       config.zookeeperStateZnode)
+  }
+
+  @Inject
+  @Singleton
+  @Provides
+  def provideStore(zk: ZooKeeperClient, state: State): PersistenceStore = {
+    ZooKeeperUtils.ensurePath(zk,
+                              ZooDefs.Ids.OPEN_ACL_UNSAFE,
+                              config.zookeeperStateZnode)
+
+    new MesosStatePersistenceStore(zk, config, state)
+  }
+
+  @Provides
+  @Singleton
+  def provideFrameworkIdUtil(state: State): FrameworkIdUtil = {
+    new FrameworkIdUtil(state)
   }
 
   @Inject

src/main/scala/com/airbnb/scheduler/mesos/MesosJobFramework.scala

@@ -10,6 +10,7 @@ import org.apache.mesos.{Protos, SchedulerDriver, Scheduler}
 import org.apache.mesos.Protos._
 
 import scala.collection.mutable.HashSet
+import mesosphere.mesos.util.FrameworkIdUtil
 
 /**
  * Provides the interface to mesos. Receives callbacks from mesos when resources are offered, declined etc.
@@ -19,7 +20,8 @@ class MesosJobFramework @Inject()(
     val mesosDriver: MesosDriverFactory,
     val scheduler: JobScheduler,
     val taskManager: TaskManager,
-    val config: SchedulerConfiguration)
+    val config: SchedulerConfiguration,
+    val frameworkIdUtil: FrameworkIdUtil)
   extends Scheduler {
 
   private[this] val log = Logger.getLogger(getClass.getName)
@@ -32,6 +34,7 @@ class MesosJobFramework @Inject()(
   def registered(schedulerDriver: SchedulerDriver, frameworkID: FrameworkID, masterInfo: MasterInfo) {
     log.info("Registered")
     log.info("Master info:" + masterInfo.toString)
+    frameworkIdUtil.store(frameworkID)
   }
 
   /* Overridden methods from MesosScheduler */