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/07/31 02:36:51 UTC
[1/4] git commit: [STORM-239] Allow supervisor to operate in paths
with spaces in them
Repository: incubator-storm
Updated Branches:
refs/heads/master c8a6e716a -> b1c5e7eae
[STORM-239] Allow supervisor to operate in paths with spaces in them
Works around a bug in path-escaping for Resources, described here:
http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4466485
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/dcd4bf7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/dcd4bf7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/dcd4bf7c
Branch: refs/heads/master
Commit: dcd4bf7c33c799fca8ea67ba22f1bee7c6b40f4b
Parents: 9e77cd2
Author: Adrian Petrescu <ap...@gmail.com>
Authored: Fri Jul 11 13:18:30 2014 -0400
Committer: Adrian Petrescu <ap...@gmail.com>
Committed: Fri Jul 11 17:19:21 2014 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/dcd4bf7c/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 414d894..d9ff3f3 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -15,6 +15,7 @@
;; limitations under the License.
(ns backtype.storm.daemon.supervisor
(:import [backtype.storm.scheduler ISupervisor])
+ (:import [java.net URI])
(:use [backtype.storm bootstrap])
(:use [backtype.storm.daemon common])
(:require [backtype.storm.daemon [worker :as worker]])
@@ -522,17 +523,19 @@
(FileUtils/copyDirectory (File. master-code-dir) (File. stormroot))
(let [classloader (.getContextClassLoader (Thread/currentThread))
resources-jar (resources-jar)
- url (.getResource classloader RESOURCES-SUBDIR)
+ ;; Work-around for JDK-4466485
+ uri (if-let [url (.getResource classloader RESOURCES-SUBDIR)]
+ (URI. (str url)))
target-dir (str stormroot file-path-separator RESOURCES-SUBDIR)]
(cond
resources-jar
(do
(log-message "Extracting resources from jar at " resources-jar " to " target-dir)
(extract-dir-from-jar resources-jar RESOURCES-SUBDIR stormroot))
- url
+ uri
(do
- (log-message "Copying resources at " (str url) " to " target-dir)
- (FileUtils/copyDirectory (File. (.getFile url)) (File. target-dir))
+ (log-message "Copying resources at " (.getPath uri) " to " target-dir)
+ (FileUtils/copyDirectory (File. (.getPath uri)) (File. target-dir))
))
)))
[3/4] git commit: Merge branch 'STORM-239' of
https://github.com/apetresc/incubator-storm into STORM-239
Posted by bo...@apache.org.
Merge branch 'STORM-239' of https://github.com/apetresc/incubator-storm into STORM-239
STORM-239: Allow supervisor to operate in paths with spaces in them
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/ee78097c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/ee78097c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/ee78097c
Branch: refs/heads/master
Commit: ee78097c0408e98df1951282ce72e7cfdc94cce8
Parents: c8a6e71 8c89d18
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Wed Jul 30 19:30:53 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Wed Jul 30 19:30:53 2014 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/ee78097c/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
[2/4] git commit: Upmerging with master and fixing merge conflicts
Posted by bo...@apache.org.
Upmerging with master and fixing merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/8c89d188
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/8c89d188
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/8c89d188
Branch: refs/heads/master
Commit: 8c89d188a910a57a4e10bc956206c0f16e5d827d
Parents: dcd4bf7 7ac24b8
Author: Adrian Petrescu <ap...@gmail.com>
Authored: Thu Jul 24 16:53:59 2014 -0400
Committer: Adrian Petrescu <ap...@gmail.com>
Committed: Thu Jul 24 16:53:59 2014 -0400
----------------------------------------------------------------------
CHANGELOG.md | 9 +
LICENSE | 30 ++-
README.markdown | 6 +
STORM-UI-REST-API.md | 23 +-
bin/storm | 20 +-
storm-core/src/clj/backtype/storm/cluster.clj | 29 +++
.../src/clj/backtype/storm/command/monitor.clj | 37 +++
.../clj/backtype/storm/daemon/supervisor.clj | 49 ++--
.../src/clj/backtype/storm/daemon/worker.clj | 16 +-
storm-core/src/clj/backtype/storm/testing.clj | 48 ++--
storm-core/src/clj/backtype/storm/ui/core.clj | 2 +-
.../src/clj/backtype/storm/ui/helpers.clj | 5 -
storm-core/src/clj/backtype/storm/zookeeper.clj | 25 ++
storm-core/src/jvm/backtype/storm/Config.java | 121 +++++----
.../jvm/backtype/storm/ConfigValidation.java | 70 ++++++
.../backtype/storm/task/TopologyContext.java | 4 +
.../src/jvm/backtype/storm/utils/Monitor.java | 249 +++++++++++++++++++
.../src/jvm/backtype/storm/utils/Utils.java | 23 +-
storm-core/src/ui/public/component.html | 3 +-
.../src/ui/public/js/jquery.tablesorter.min.js | 9 +-
storm-core/src/ui/public/js/moment.min.js | 6 +
storm-core/src/ui/public/js/script.js | 9 +
.../test/clj/backtype/storm/config_test.clj | 41 ++-
.../test/clj/backtype/storm/supervisor_test.clj | 20 +-
24 files changed, 713 insertions(+), 141 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/8c89d188/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index d9ff3f3,573b3d7..2545283
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@@ -14,8 -14,8 +14,9 @@@
;; See the License for the specific language governing permissions and
;; limitations under the License.
(ns backtype.storm.daemon.supervisor
- (:import [backtype.storm.scheduler ISupervisor])
- (:import [java.net URI])
+ (:import [backtype.storm.scheduler ISupervisor]
- [java.net JarURLConnection])
++ [java.net JarURLConnection]
++ [java.net URI])
(:use [backtype.storm bootstrap])
(:use [backtype.storm.daemon common])
(:require [backtype.storm.daemon [worker :as worker]])
@@@ -532,11 -545,14 +546,14 @@@
(do
(log-message "Extracting resources from jar at " resources-jar " to " target-dir)
(extract-dir-from-jar resources-jar RESOURCES-SUBDIR stormroot))
- uri
+ url
(do
- (log-message "Copying resources at " (.getPath uri) " to " target-dir)
- (FileUtils/copyDirectory (File. (.getPath uri)) (File. target-dir))
- ))
- (log-message "Copying resources at " (str url) " to " target-dir)
++ (log-message "Copying resources at " (URI. (str url)) " to " target-dir)
+ (if (= (.getProtocol url) "jar" )
+ (extract-dir-from-jar (.getFile (.getJarFileURL (.openConnection url))) RESOURCES-SUBDIR stormroot)
- (FileUtils/copyDirectory (File. (.getFile url)) (File. target-dir)))
++ (FileUtils/copyDirectory (File. (.getPath (URI. (str url)))) (File. target-dir)))
+ )
+ )
)))
(defmethod launch-worker
[4/4] git commit: Added STORM-239 to Changelog
Posted by bo...@apache.org.
Added STORM-239 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/b1c5e7ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/b1c5e7ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/b1c5e7ea
Branch: refs/heads/master
Commit: b1c5e7eae5b647b13df5b82990eed5f3bbea9d81
Parents: ee78097
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Wed Jul 30 19:31:58 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Wed Jul 30 19:31:58 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b1c5e7ea/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8b90f3..9599e25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
* STORM-366: Add color span to most recent error and fix ui templates.
* STORM-369: topology summary page displays wrong order.
* STORM-350: LMAX Disruptor 3.2.1
+ * STORM-239: Allow supervisor to operate in paths with spaces in them
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake