more chronos mucking around

jepsen-io · Aug 18, 2015 · cf35539 · cf35539
1 parent 5821133
commit cf35539
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/chronos/src/jepsen/chronos.clj b/chronos/src/jepsen/chronos.clj
@@ -228,9 +228,10 @@
       (if (not= :resurrect (:f op))
         (client/invoke! nemesis test op)
         (do (c/on-many (:nodes test)
-                       (mesosphere/start-master! test c/*host*)
-                       (mesosphere/start-slave! test c/*host*)
-                       (start! test c/*host*))
+                       (let [node (keyword c/*host*)]
+                         (mesosphere/start-master! test node)
+                         (mesosphere/start-slave! test node)
+                         (start! test node)))
             (assoc op :value :resurrection-complete))))
 
     (teardown! [this test]

diff --git a/chronos/src/jepsen/mesosphere.clj b/chronos/src/jepsen/mesosphere.clj
@@ -65,7 +65,7 @@
   of code to DB concepts here; maybe change this back to \"primary\" or
   \"supervisor\" later?"
   [test node]
-  (when (some #{node} (take master-count (:nodes test)))
+  (when (some #{node} (take master-count (sort (:nodes test))))
     (info node "starting mesos-master")
     (c/su
       (c/exec :start-stop-daemon :--start
@@ -98,7 +98,7 @@
   of code to DB concepts here; maybe change this back to \"primary\" or
   \"supervisor\" later?"
   [test node]
-  (when-not (some #{node} (take master-count (:nodes test)))
+  (when-not (some #{node} (take master-count (sort (:nodes test))))
     (info node "starting mesos-slave")
     (c/su
       (c/exec :start-stop-daemon :--start