You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/04/22 18:39:16 UTC
[04/10] git commit: Do not encode,
decode topo id when launching worker
Do not encode,decode topo id when launching worker
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/6d1ad6a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/6d1ad6a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/6d1ad6a6
Branch: refs/heads/master
Commit: 6d1ad6a6a3835294a564ab63b1d6399ee7843e18
Parents: c7c7087
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Sun Jan 12 20:46:46 2014 +0000
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Wed Jan 15 03:16:53 2014 +0000
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
storm-core/src/clj/backtype/storm/daemon/worker.clj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/6d1ad6a6/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index ea2b460..a38ee5c 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -465,7 +465,7 @@
(str "-Dworker.port=" port)
"-cp" classpath
"backtype.storm.daemon.worker"
- (java.net.URLEncoder/encode storm-id)
+ storm-id
(:assignment-id supervisor)
port
worker-id]
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/6d1ad6a6/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj
index 3055b66..0d1f6c6 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -451,4 +451,4 @@
(defn -main [storm-id assignment-id port-str worker-id]
(let [conf (read-storm-config)]
(validate-distributed-mode! conf)
- (mk-worker conf nil (java.net.URLDecoder/decode storm-id) assignment-id (Integer/parseInt port-str) worker-id)))
+ (mk-worker conf nil storm-id assignment-id (Integer/parseInt port-str) worker-id)))