You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by zh...@apache.org on 2016/01/28 18:49:51 UTC
[15/23] storm git commit: Manual test
Manual test
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b4847b76
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b4847b76
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b4847b76
Branch: refs/heads/master
Commit: b4847b76f0222344a51987fce1c8180616a4c279
Parents: fd37de9
Author: zhuol <zh...@yahoo-inc.com>
Authored: Tue Jan 19 17:33:51 2016 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Wed Jan 20 09:55:25 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/supervisor.clj | 2 +-
storm-core/src/clj/org/apache/storm/daemon/worker.clj | 4 ++--
.../src/clj/org/apache/storm/pacemaker/pacemaker.clj | 2 +-
.../src/jvm/org/apache/storm/utils/ConfigUtils.java | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b4847b76/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
index 2461e52..69ee128 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
@@ -893,7 +893,7 @@
(defn download-blobs-for-topology!
"Download all blobs listed in the topology configuration for a given topology."
[conf stormconf-path localizer tmproot]
- (let [storm-conf (ConfigUtils/readSupervisorStormConfGivenPath conf stormconf-path)
+ (let [storm-conf (clojurify-structure (ConfigUtils/readSupervisorStormConfGivenPath conf stormconf-path))
blobstore-map (storm-conf TOPOLOGY-BLOBSTORE-MAP)
user (storm-conf TOPOLOGY-SUBMITTER-USER)
topo-name (storm-conf TOPOLOGY-NAME)
http://git-wip-us.apache.org/repos/asf/storm/blob/b4847b76/storm-core/src/clj/org/apache/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/worker.clj b/storm-core/src/clj/org/apache/storm/daemon/worker.clj
index 99080db..aa47682 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/worker.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/worker.clj
@@ -590,8 +590,8 @@
(def latest-log-config (atom {}))
(def original-log-levels (atom {}))
- (let [storm-conf (clojurify-structure (ConfigUtils/readSupervisorStormConf conf storm-id))
- storm-conf (ConfigUtils/overrideLoginConfigWithSystemProperty storm-conf)
+ (let [storm-conf (ConfigUtils/readSupervisorStormConf conf storm-id)
+ storm-conf (clojurify-structure (ConfigUtils/overrideLoginConfigWithSystemProperty storm-conf))
acls (Utils/getWorkerACL storm-conf)
cluster-state (cluster/mk-distributed-cluster-state conf :auth-conf storm-conf :acls acls :context (ClusterStateContext. DaemonType/WORKER))
storm-cluster-state (cluster/mk-storm-cluster-state cluster-state :acls acls)
http://git-wip-us.apache.org/repos/asf/storm/blob/b4847b76/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj b/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj
index 086debc..2204cc4 100644
--- a/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj
+++ b/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj
@@ -233,7 +233,7 @@
(log-message "Starting pacemaker server for storm version '"
STORM-VERSION
"'")
- (let [conf (ConfigUtils/overrideLoginConfigWithSystemProperty (clojurify-structure (ConfigUtils/readStormConfig)))]
+ (let [conf (clojurify-structure (ConfigUtils/overrideLoginConfigWithSystemProperty (ConfigUtils/readStormConfig)))]
(PacemakerServer. (mk-handler conf) conf)))
(defn -main []
http://git-wip-us.apache.org/repos/asf/storm/blob/b4847b76/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
index a41af47..dcff7c6 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
@@ -635,30 +635,30 @@ public class ConfigUtils {
return (workerArtifactsRoot(conf) + FILE_SEPARATOR + id);
}
- public static String workerArtifactsRoot(Map conf, String id, String port) {
+ public static String workerArtifactsRoot(Map conf, String id, Integer port) {
if (mockedWorkerArtifactsRoot != null) {
return mockedWorkerArtifactsRoot;
}
return (workerArtifactsRoot(conf, id) + FILE_SEPARATOR + port);
}
- public static String workerArtifactsPidPath(Map conf, String id, String port) {
+ public static String workerArtifactsPidPath(Map conf, String id, Integer port) {
return (workerArtifactsRoot(conf, id, port) + FILE_SEPARATOR + "worker.pid");
}
public static File getLogMetaDataFile(String fname) {
String[] subStrings = fname.split(FILE_SEPARATOR); // TODO: does this work well on windows?
String id = subStrings[0];
- String port = subStrings[1];
+ Integer port = Integer.parseInt(subStrings[1]);
return getLogMetaDataFile(Utils.readStormConfig(), id, port);
}
- public static File getLogMetaDataFile(Map conf, String id, String port) {
+ public static File getLogMetaDataFile(Map conf, String id, Integer port) {
String fname = workerArtifactsRoot(conf, id, port) + FILE_SEPARATOR + "worker.yaml";
return new File(fname);
}
- public static File getWorkerDirFromRoot(String logRoot, String id, String port) {
+ public static File getWorkerDirFromRoot(String logRoot, String id, Integer port) {
return new File((logRoot + FILE_SEPARATOR + id + FILE_SEPARATOR + port));
}