You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ar...@apache.org on 2016/02/23 09:42:31 UTC
[1/3] storm git commit: STORM-1566 Passing File instance of path
String
Repository: storm
Updated Branches:
refs/heads/master a3abb6599 -> 58050a5b3
STORM-1566 Passing File instance of path String
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ef6dfb99
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ef6dfb99
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ef6dfb99
Branch: refs/heads/master
Commit: ef6dfb9943163d80ff1355e6e1cfcac977d2b8cd
Parents: 4ca7522
Author: Satish Duggana <sd...@hortonworks.com>
Authored: Mon Feb 22 12:02:26 2016 +0530
Committer: Satish Duggana <sd...@hortonworks.com>
Committed: Mon Feb 22 12:02:26 2016 +0530
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/worker.clj | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ef6dfb99/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 8f9becd..db4a61a 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/worker.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/worker.clj
@@ -21,6 +21,7 @@
(:require [org.apache.storm.daemon [executor :as executor]])
(:require [org.apache.storm [cluster :as cluster]])
(:require [clojure.set :as set])
+ (:import [java.io File])
(:import [java.util.concurrent Executors]
[org.apache.storm.hooks IWorkerHook BaseWorkerHook]
[uk.org.lidalia.sysoutslf4j.context SysOutOverSLF4J])
@@ -619,7 +620,7 @@
(when-not (ConfigUtils/isLocalMode conf)
(SysOutOverSLF4J/sendSystemOutAndErrToSLF4J)
(let [pid (Utils/processPid)]
- (FileUtils/touch (ConfigUtils/workerPidPath conf worker-id pid))
+ (FileUtils/touch (File. (ConfigUtils/workerPidPath conf worker-id pid)))
(spit (ConfigUtils/workerArtifactsPidPath conf storm-id port) pid)))
(declare establish-log-setting-callback)
[2/3] storm git commit: Merge branch 'STORM-1566' of
https://github.com/satishd/storm into STORM-1566
Posted by ar...@apache.org.
Merge branch 'STORM-1566' of https://github.com/satishd/storm into STORM-1566
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/652ba36c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/652ba36c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/652ba36c
Branch: refs/heads/master
Commit: 652ba36c5a75c230638b2f5bbbdfd909c2b23df0
Parents: a3abb65 ef6dfb9
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Tue Feb 23 14:02:58 2016 +0530
Committer: Arun Mahadevan <ai...@hortonworks.com>
Committed: Tue Feb 23 14:02:58 2016 +0530
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/worker.clj | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] storm git commit: add STORM-1566 to changelog
Posted by ar...@apache.org.
add STORM-1566 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/58050a5b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/58050a5b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/58050a5b
Branch: refs/heads/master
Commit: 58050a5b3e8972717ccf2227e3e8bbdd8034fb43
Parents: 652ba36
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Tue Feb 23 14:04:48 2016 +0530
Committer: Arun Mahadevan <ai...@hortonworks.com>
Committed: Tue Feb 23 14:04:48 2016 +0530
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/58050a5b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a63d798..d422fa1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-1566: Worker exits with error o.a.s.d.worker [ERROR] Error on initialization of server mk-worker
* STORM-1558: Utils in java breaks component page due to illegal type cast
* STORM-1553: port event.clj to java
* STORM-1262: port backtype.storm.command.dev-zookeeper to java.