Remove nimbus.reassign config and make it unavialble to users
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/404bb6ac Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/404bb6ac Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/404bb6ac Branch: refs/heads/master Commit: 404bb6acab26e3c58644c2ccf75b3abe601f40bf Parents: ce5dd66 Author: Kishor Patil <kpa...@yahoo-inc.com> Authored: Fri Oct 23 19:45:29 2015 -0500 Committer: Kishor Patil <kpa...@yahoo-inc.com> Committed: Fri Oct 23 19:45:29 2015 -0500 ---------------------------------------------------------------------- conf/defaults.yaml | 1 - storm-core/src/clj/backtype/storm/config.clj | 1 + storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 2 +- storm-core/src/jvm/backtype/storm/Config.java | 7 ------- storm-core/test/clj/backtype/storm/supervisor_test.clj | 6 +++--- 5 files changed, 5 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/404bb6ac/conf/defaults.yaml ---------------------------------------------------------------------- diff --git a/conf/defaults.yaml b/conf/defaults.yaml index dae8773..7166bd4 100644 --- a/conf/defaults.yaml +++ b/conf/defaults.yaml @@ -65,7 +65,6 @@ nimbus.cleanup.inbox.freq.secs: 600 nimbus.inbox.jar.expiration.secs: 3600 nimbus.code.sync.freq.secs: 300 nimbus.task.launch.secs: 120 -nimbus.reassign: true nimbus.file.copy.expiration.secs: 600 nimbus.topology.validator: "backtype.storm.nimbus.DefaultTopologyValidator" topology.min.replication.count: 1 http://git-wip-us.apache.org/repos/asf/storm/blob/404bb6ac/storm-core/src/clj/backtype/storm/config.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/config.clj b/storm-core/src/clj/backtype/storm/config.clj index 0d4f1e6..e1cafec 100644 --- a/storm-core/src/clj/backtype/storm/config.clj +++ b/storm-core/src/clj/backtype/storm/config.clj @@ -25,6 +25,7 @@ (:use [backtype.storm log util])) (def RESOURCES-SUBDIR "resources") +(def NIMBUS-DO-NOT-REASSIGN "NIMBUS-DO-NOT-REASSIGN") (defn- clojure-config-name [name] (.replace (.toUpperCase name) "_" "-")) http://git-wip-us.apache.org/repos/asf/storm/blob/404bb6ac/storm-core/src/clj/backtype/storm/daemon/nimbus.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj index 4bf49b9..1110614 100644 --- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj +++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj @@ -1166,7 +1166,7 @@ 0 (conf NIMBUS-MONITOR-FREQ-SECS) (fn [] - (when (conf NIMBUS-REASSIGN) + (when-not (conf NIMBUS-DO-NOT-REASSIGN) (locking (:submit-lock nimbus) (mk-assignments nimbus))) (do-cleanup nimbus) http://git-wip-us.apache.org/repos/asf/storm/blob/404bb6ac/storm-core/src/jvm/backtype/storm/Config.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java index c2ed719..810d5f4 100644 --- a/storm-core/src/jvm/backtype/storm/Config.java +++ b/storm-core/src/jvm/backtype/storm/Config.java @@ -470,13 +470,6 @@ public class Config extends HashMap<String, Object> { public static final String NIMBUS_TASK_LAUNCH_SECS = "nimbus.task.launch.secs"; /** - * Whether or not nimbus should reassign tasks if it detects that a task goes down. - * Defaults to true, and it's not recommended to change this value. - */ - @isBoolean - public static final String NIMBUS_REASSIGN = "nimbus.reassign"; - - /** * During upload/download with the master, how long an upload or download connection is idle * before nimbus considers it dead and drops the connection. */ http://git-wip-us.apache.org/repos/asf/storm/blob/404bb6ac/storm-core/test/clj/backtype/storm/supervisor_test.clj ---------------------------------------------------------------------- diff --git a/storm-core/test/clj/backtype/storm/supervisor_test.clj b/storm-core/test/clj/backtype/storm/supervisor_test.clj index 57d4cc2..fab401a 100644 --- a/storm-core/test/clj/backtype/storm/supervisor_test.clj +++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj @@ -75,7 +75,7 @@ (deftest launches-assignment (with-simulated-time-local-cluster [cluster :supervisors 0 - :daemon-conf {NIMBUS-REASSIGN false + :daemon-conf {NIMBUS-DO-NOT-REASSIGN true SUPERVISOR-WORKER-START-TIMEOUT-SECS 5 SUPERVISOR-WORKER-TIMEOUT-SECS 15 SUPERVISOR-MONITOR-FREQUENCY-SECS 3}] @@ -128,7 +128,7 @@ (deftest test-multiple-active-storms-multiple-supervisors (with-simulated-time-local-cluster [cluster :supervisors 0 - :daemon-conf {NIMBUS-REASSIGN false + :daemon-conf {NIMBUS-DO-NOT-REASSIGN true SUPERVISOR-WORKER-START-TIMEOUT-SECS 5 SUPERVISOR-WORKER-TIMEOUT-SECS 15 SUPERVISOR-MONITOR-FREQUENCY-SECS 3}] @@ -659,7 +659,7 @@ (with-simulated-time-local-cluster [cluster :supervisors 0 :ports-per-supervisor 2 - :daemon-conf {NIMBUS-REASSIGN false + :daemon-conf {NIMBUS-DO-NOT-REASSIGN true NIMBUS-MONITOR-FREQ-SECS 10 TOPOLOGY-MESSAGE-TIMEOUT-SECS 30 TOPOLOGY-ACKER-EXECUTORS 0}]
