You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/09/21 16:11:04 UTC
[1/3] storm git commit: configurable supervisor log filename
Repository: storm
Updated Branches:
refs/heads/master ca52c2668 -> 7e69ff4aa
configurable supervisor log filename
For the storm-on-mesos project there are multiple Storm Supervisors on
every worker host. Each of these Supervisors is dedicated to a
particular topology. A challenge with this design is that the shared
supervisor log file contains logs from every single topology that
has run on a particular host. We instead want the option to have
separate supervisor log files for each topology, so that topology owners
can more easily debug their own problems.
This change allows having configurable log files for every launch of
the Supervisor, since we will be able to embed the topology ID into the
supervisor log filename.
Notably, storm-0.10 already includes a similar change for the worker
log filenames (came in with Yahoo!'s multi-tenant changes).
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/38139303
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/38139303
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/38139303
Branch: refs/heads/master
Commit: 38139303f6777e978516e9d4ad884220d9aad38b
Parents: 0a5426e
Author: Erik Weathers <er...@gmail.com>
Authored: Mon Sep 14 13:46:36 2015 -0700
Committer: Erik Weathers <er...@gmail.com>
Committed: Mon Sep 14 13:46:36 2015 -0700
----------------------------------------------------------------------
bin/storm.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/38139303/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 597426d..0c3595e 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -77,6 +77,7 @@ if (not os.path.isfile(os.path.join(USER_CONF_DIR, "storm.yaml"))):
STORM_LIB_DIR = os.path.join(STORM_DIR, "lib")
STORM_BIN_DIR = os.path.join(STORM_DIR, "bin")
STORM_LOG4J2_CONF_DIR = os.path.join(STORM_DIR, "log4j2")
+STORM_SUPERVISOR_LOG_FILE = os.getenv('STORM_SUPERVISOR_LOG_FILE', "supervisor.log")
init_storm_env()
@@ -401,7 +402,7 @@ def supervisor(klass="backtype.storm.daemon.supervisor"):
"""
cppaths = [CLUSTER_CONF_DIR]
jvmopts = parse_args(confvalue("supervisor.childopts", cppaths)) + [
- "-Dlogfile.name=supervisor.log",
+ "-Dlogfile.name=" + STORM_SUPERVISOR_LOG_FILE,
"-Dlog4j.configurationFile=" + os.path.join(get_log4j2_conf_dir(), "cluster.xml"),
]
exec_storm_class(
[2/3] storm git commit: Merge branch
'configurable-supervisor-log-filename' of https://github.com/erikdw/storm
into STORM-1056
Posted by ka...@apache.org.
Merge branch 'configurable-supervisor-log-filename' of https://github.com/erikdw/storm into STORM-1056
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d9c9b0b4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d9c9b0b4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d9c9b0b4
Branch: refs/heads/master
Commit: d9c9b0b4c09ac053918fc854b08b6470b921e256
Parents: ca52c26 3813930
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Sep 21 23:06:05 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 21 23:06:05 2015 +0900
----------------------------------------------------------------------
bin/storm.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] storm git commit: add STORM-1056 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1056 to CHANGELOG.md
* also add Erik Weathers to contributor list
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7e69ff4a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7e69ff4a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7e69ff4a
Branch: refs/heads/master
Commit: 7e69ff4aa3e2f1fe46c59ed8251bb83d21d42415
Parents: d9c9b0b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Sep 21 23:07:47 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 21 23:07:47 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7e69ff4a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10826f7..799821a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
* STORM-949: On the topology summary UI page, last shown error should have the time and date
## 0.10.0-beta2
+ * STORM-1056: allow supervisor log filename to be configurable via ENV variable
* STORM-1055: storm-jdbc README needs fixes and context
* STORM-1044: Setting dop to zero does not raise an error
* STORM-1050: Topologies with same name run on one cluster
http://git-wip-us.apache.org/repos/asf/storm/blob/7e69ff4a/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 8f13af3..07063e5 100644
--- a/README.markdown
+++ b/README.markdown
@@ -230,6 +230,7 @@ under the License.
* chenyuzhao ([@danny0405](https://github.com/danny0405))
* Michael Schonfeld ([@schonfeld](https://github.com/schonfeld))
* Matthias J. Sax ([@mjsax](https://github.com/mjsax))
+* Erik Weathers ([@erikdw](https://github.com/erikdw))
## Acknowledgements