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 2015/07/16 22:53:16 UTC

[1/3] storm git commit: create logs metadata dir when running securely

Repository: storm
Updated Branches:
  refs/heads/master af781c90e -> e2157678f


create logs metadata dir when running securely


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f021d1fd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f021d1fd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f021d1fd

Branch: refs/heads/master
Commit: f021d1fd0db14c4d446813783be908596e816be8
Parents: 27bc183
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Tue Jun 9 18:31:38 2015 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Tue Jun 9 18:31:38 2015 -0500

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/f021d1fd/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 41533df..be8f682 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -596,9 +596,11 @@
   (let [file (get-log-metadata-file storm-id port)]
     ;;run worker as user needs the directory to have special permissions
     ;; or it is insecure
-    (when (and (not (conf SUPERVISOR-RUN-WORKER-AS-USER))
-               (not (.exists (.getParentFile file))))
-      (.mkdirs (.getParentFile file)))
+    (when (not (.exists (.getParentFile file)))
+      (if (conf SUPERVISOR-RUN-WORKER-AS-USER)
+        (do (FileUtils/forceMkdir (.getParentFile file))
+            (setup-storm-code-dir conf (read-supervisor-storm-conf conf storm-id) (.getCanonicalPath (.getParentFile file))))
+        (.mkdirs (.getParentFile file))))
     (let [writer (java.io.FileWriter. file)
         yaml (Yaml.)]
       (try


[2/3] storm git commit: Merge branch 'storm-857-mkdir-metadata-run-as-user' of https://github.com/d2r/storm into STORM-857

Posted by bo...@apache.org.
Merge branch 'storm-857-mkdir-metadata-run-as-user' of https://github.com/d2r/storm into STORM-857

STORM-857: create logs metadata dir when running securely


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3c6e04fb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3c6e04fb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3c6e04fb

Branch: refs/heads/master
Commit: 3c6e04fbf7654e210fb3a4436f891619f1d5bba2
Parents: af781c9 f021d1f
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jul 16 15:37:31 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jul 16 15:37:31 2015 -0500

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------



[3/3] storm git commit: Added STORM-857 to Changelog

Posted by bo...@apache.org.
Added STORM-857 to Changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e2157678
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e2157678
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e2157678

Branch: refs/heads/master
Commit: e2157678f2f5c99455cac4ddc61f21fec66f99cf
Parents: 3c6e04f
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jul 16 15:37:59 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jul 16 15:37:59 2015 -0500

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/e2157678/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39f3ab7..94bd859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
  * STORM-799: Use IErrorReport interface more broadly
  * STORM-926: change pom to use maven-shade-plugin:2.2
  * STORM-793: Made change to logviewer.clj in order to remove the invalid http 500 response
+ * STORM-857: create logs metadata dir when running securely
 
 ## 0.10.0-beta2
  * STORM-843: [storm-redis] Add Javadoc to storm-redis