Merge branch 'master' into 0.9.0

nathanmarz · Dec 20, 2012 · 0182cc3 · 0182cc3
2 parents 7f2b38a + 2ec670b
commit 0182cc3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/clj/backtype/storm/scheduler/IsolationScheduler.clj b/src/clj/backtype/storm/scheduler/IsolationScheduler.clj
@@ -93,6 +93,7 @@
        (group-by #(.getHost cluster (.getNodeId ^WorkerSlot %)) <>)
        (dissoc <> nil)
        (sort-by #(-> % second count -) <>)
+       shuffle
        (LinkedList. <>)
        ))
 
@@ -160,7 +161,7 @@
       (let [top-id (-> assignments first second)
             distribution (get topology-machine-distribution top-id)
             ^Set worker-specs (get topology-worker-specs top-id)
-            num-workers (count host-assignments)
+            num-workers (count assignments)
             ]
         (if (and (contains? iso-ids-set top-id)
                  (every? #(= (second %) top-id) assignments)

diff --git a/test/clj/backtype/storm/nimbus_test.clj b/test/clj/backtype/storm/nimbus_test.clj
@@ -48,6 +48,15 @@
          set         
          )))
 
+(defn topology-slots [state storm-name]
+  (let [storm-id (get-storm-id state storm-name)
+        assignment (.assignment-info state storm-id nil)]
+    (->> assignment
+         :executor->node+port
+         vals
+         set         
+         )))
+
 (defn topology-node-distribution [state storm-name]
   (let [storm-id (get-storm-id state storm-name)
         assignment (.assignment-info state storm-id nil)]
@@ -189,13 +198,14 @@
       ))))
 
 (deftest test-isolated-assignment
-  (with-local-cluster [cluster :supervisors 6
+  (with-simulated-time-local-cluster [cluster :supervisors 6
                                :ports-per-supervisor 3
                                :inimbus (isolation-nimbus)
                                :daemon-conf {SUPERVISOR-ENABLE false
                                              TOPOLOGY-ACKER-EXECUTORS 0
                                              STORM-SCHEDULER "backtype.storm.scheduler.IsolationScheduler"
                                              ISOLATION-SCHEDULER-MACHINES {"tester1" 3 "tester2" 2}
+                                             NIMBUS-MONITOR-FREQ-SECS 10
                                              }]
     (letlocals
       (bind state (:storm-cluster-state cluster))
@@ -206,11 +216,13 @@
                        "3" (thrift/mk-bolt-spec {"2" :none} (TestPlannerBolt.))}))
 
       (submit-local-topology nimbus "noniso" {TOPOLOGY-OPTIMIZE false TOPOLOGY-WORKERS 4} topology)
+      (advance-cluster-time cluster 1)
       (is (= 4 (topology-num-nodes state "noniso")))
       (is (= 4 (storm-num-workers state "noniso")))
 
       (submit-local-topology nimbus "tester1" {TOPOLOGY-OPTIMIZE false TOPOLOGY-WORKERS 6} topology)
       (submit-local-topology nimbus "tester2" {TOPOLOGY-OPTIMIZE false TOPOLOGY-WORKERS 6} topology)
+      (advance-cluster-time cluster 1)
 
       (bind task-info-tester1 (storm-component->task-info cluster "tester1"))
       (bind task-info-tester2 (storm-component->task-info cluster "tester2"))
@@ -227,6 +239,16 @@
       (check-consistency cluster "tester1")
       (check-consistency cluster "tester2")
       (check-consistency cluster "noniso")
+
+      ;;check that nothing gets reassigned
+      (bind tester1-slots (topology-slots state "tester1"))
+      (bind tester2-slots (topology-slots state "tester2"))
+      (bind noniso-slots (topology-slots state "noniso"))    
+      (advance-cluster-time cluster 20)
+      (is (= tester1-slots (topology-slots state "tester1")))
+      (is (= tester2-slots (topology-slots state "tester2")))
+      (is (= noniso-slots (topology-slots state "noniso")))
+
       )))
 
 (deftest test-zero-executor-or-tasks