You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2016/02/18 21:56:23 UTC
[1/3] storm git commit: STORM-1516 Fixed issue in writing pids with
distributed cluster mode.
Repository: storm
Updated Branches:
refs/heads/master 561cecaab -> abb1b85f2
STORM-1516 Fixed issue in writing pids with distributed cluster mode.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8749523c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8749523c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8749523c
Branch: refs/heads/master
Commit: 8749523cf78f9a466aaf68399287f8e48a7e0132
Parents: 4699990
Author: Satish Duggana <sd...@hortonworks.com>
Authored: Wed Feb 17 11:14:50 2016 +0530
Committer: Satish Duggana <sd...@hortonworks.com>
Committed: Wed Feb 17 11:17:17 2016 +0530
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/worker.clj | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8749523c/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 83ae9be..f4690e0 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/worker.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/worker.clj
@@ -603,11 +603,11 @@
(defserverfn mk-worker [conf shared-mq-context storm-id assignment-id port worker-id]
(log-message "Launching worker for " storm-id " on " assignment-id ":" port " with id " worker-id
" and conf " conf)
- (if-not (ConfigUtils/isLocalMode conf)
- (SysOutOverSLF4J/sendSystemOutAndErrToSLF4J))
;; because in local mode, its not a separate
;; process. supervisor will register it in this case
- (when (= :distributed (ConfigUtils/clusterMode conf))
+ ;; if (ConfigUtils/isLocalMode conf) returns false then it is in distributed mode.
+ (when-not (ConfigUtils/isLocalMode conf)
+ (SysOutOverSLF4J/sendSystemOutAndErrToSLF4J)
(let [pid (Utils/processPid)]
(FileUtils/touch (ConfigUtils/workerPidPath conf worker-id pid))
(spit (ConfigUtils/workerArtifactsPidPath conf storm-id port) pid)))
[3/3] storm git commit: Added STORM-1516 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-1516 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/abb1b85f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/abb1b85f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/abb1b85f
Branch: refs/heads/master
Commit: abb1b85f2bb8aab6bde52a4b5cecd4b22e11c7e6
Parents: e904053
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Feb 18 12:41:39 2016 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Feb 18 12:41:39 2016 -0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/abb1b85f/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bfcb0c..00e77e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-1516: Fixed issue in writing pids with distributed cluster mode.
* STORM-1253: port backtype.storm.timer to java
* STORM-1258: port thrift.clj to Thrift.java
* STORM-1336: Evalute/Port JStorm cgroup support and implement cgroup support for RAS
[2/3] storm git commit: Merge branch 'storm-1516' of
http://github.com/satishd/storm into STORM-1516
Posted by sr...@apache.org.
Merge branch 'storm-1516' of http://github.com/satishd/storm into STORM-1516
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e904053a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e904053a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e904053a
Branch: refs/heads/master
Commit: e904053a819bfe53fd280ad7d3b2061a805d83a1
Parents: 561ceca 8749523
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Feb 18 12:40:16 2016 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Feb 18 12:40:16 2016 -0800
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/worker.clj | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e904053a/storm-core/src/clj/org/apache/storm/daemon/worker.clj
----------------------------------------------------------------------