Removing injection of LeaderElector, zookeeper is probably all we will ever use.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/50fdcee5 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/50fdcee5 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/50fdcee5 Branch: refs/heads/0.11.x-branch Commit: 50fdcee5411be401534559c9822e45a50b477d96 Parents: 547ed49 Author: Parth Brahmbhatt <[email protected]> Authored: Thu Dec 18 19:44:10 2014 -0800 Committer: Parth Brahmbhatt <[email protected]> Committed: Thu Dec 18 19:44:10 2014 -0800 ---------------------------------------------------------------------- storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 11 +---------- storm-core/src/jvm/backtype/storm/Config.java | 6 ------ storm-core/test/clj/backtype/storm/nimbus_test.clj | 2 +- 3 files changed, 2 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/50fdcee5/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 5a3fa12..e991de3 100644 --- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj +++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj @@ -64,15 +64,6 @@ (defmulti mk-bt-tracker cluster-mode) (defmulti sync-code cluster-mode) -;;TODO we should try genclass for zkLeaderElector and just set NIMBUS-LEADER-ELECTOR-CLASS in defaults.yaml -;;TODO we need to pass acls, looks like not posible as leader-latch does not work with ACLS -;;TODO we need to call .preapare or just get rid of the interface all together. -(defn mk-leader-elector [conf] - (if (conf NIMBUS-LEADER-ELECTOR-CLASS) - (do (log-message "Using custom Leade elector: " (conf NIMBUS-LEADER-ELECTOR-CLASS)) - (-> (conf NIMBUS-LEADER-ELECTOR-CLASS) new-instance)) - (zk-leader-elector conf))) - (defnk is-leader [nimbus :throw-exception true] (let [leader-elector (:leader-elector nimbus)] (if (.isLeader leader-elector) true @@ -107,7 +98,7 @@ (exit-process! 20 "Error when processing an event") )) :scheduler (mk-scheduler conf inimbus) - :leader-elector (mk-leader-elector conf) + :leader-elector (zk-leader-elector conf) :bt-tracker (mk-bt-tracker conf) :id->sched-status (atom {}) :cred-renewers (AuthUtils/GetCredentialRenewers conf) http://git-wip-us.apache.org/repos/asf/storm/blob/50fdcee5/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 81046b3..ead144f 100644 --- a/storm-core/src/jvm/backtype/storm/Config.java +++ b/storm-core/src/jvm/backtype/storm/Config.java @@ -1214,12 +1214,6 @@ public class Config extends HashMap<String, Object> { public static final Object DEV_ZOOKEEPER_PATH_SCHEMA = String.class; /** - * The class that implements {@code ILeaderElector}. - */ - public static final String NIMBUS_LEADER_ELECTOR_CLASS = "nimbus.leaderElector.class"; - public static final Object NIMBUS_LEADER_ELECTOR_CLASS_SCHEMA = String.class; - - /** * A map from topology name to the number of machines that should be dedicated for that topology. Set storm.scheduler * to backtype.storm.scheduler.IsolationScheduler to make use of the isolation scheduler. */ http://git-wip-us.apache.org/repos/asf/storm/blob/50fdcee5/storm-core/test/clj/backtype/storm/nimbus_test.clj ---------------------------------------------------------------------- diff --git a/storm-core/test/clj/backtype/storm/nimbus_test.clj b/storm-core/test/clj/backtype/storm/nimbus_test.clj index b94cb36..e408c17 100644 --- a/storm-core/test/clj/backtype/storm/nimbus_test.clj +++ b/storm-core/test/clj/backtype/storm/nimbus_test.clj @@ -1245,7 +1245,7 @@ new-instance nil mk-timer nil nimbus/mk-bt-tracker nil - nimbus/mk-leader-elector nil + zk-leader-elector nil nimbus/mk-scheduler nil] (nimbus/nimbus-data auth-conf fake-inimbus) (verify-call-times-for cluster/mk-storm-cluster-state 1)
