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/11/04 18:18:48 UTC
[05/10] storm git commit: If dynamic worker profiling is disabled,
match worker childopts.
If dynamic worker profiling is disabled, match worker childopts.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f697044a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f697044a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f697044a
Branch: refs/heads/master
Commit: f697044a466038ee081fb668be5497c7b5080a8e
Parents: d2f9305
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Tue Nov 3 00:19:10 2015 -0600
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Tue Nov 3 00:19:10 2015 -0600
----------------------------------------------------------------------
docs/DYNAMIC_WORKER_PROFILING.md | 2 +-
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f697044a/docs/DYNAMIC_WORKER_PROFILING.md
----------------------------------------------------------------------
diff --git a/docs/DYNAMIC_WORKER_PROFILING.md b/docs/DYNAMIC_WORKER_PROFILING.md
index 4b55a80..9bc8da3 100644
--- a/docs/DYNAMIC_WORKER_PROFILING.md
+++ b/docs/DYNAMIC_WORKER_PROFILING.md
@@ -25,5 +25,5 @@ Click on "My Dump Files" to go the logviewer UI for list of worker specific dump
Configuration
-------------
-The "worker.profiler.command" can be configured to point to specific pluggable profiler, heapdump commands. The "worker.profiler.enabled" can be disabled if plugin is not available.
+The "worker.profiler.command" can be configured to point to specific pluggable profiler, heapdump commands. The "worker.profiler.enabled" can be disabled if plugin is not available or jdk does not support Jprofile flight recording so that worker JVM options will not have "worker.profiler.childopts". To use different profiler plugin, you can change these configuration.
http://git-wip-us.apache.org/repos/asf/storm/blob/f697044a/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 e5740cb..c86b73f 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -844,7 +844,9 @@
(substitute-childopts s worker-id storm-id port mem-onheap))
topo-worker-childopts (when-let [s (storm-conf TOPOLOGY-WORKER-CHILDOPTS)]
(substitute-childopts s worker-id storm-id port mem-onheap))
- worker--profiler-childopts (substitute-childopts (conf WORKER-PROFILER-CHILDOPTS) worker-id storm-id port mem-onheap)
+ worker--profiler-childopts (if (conf WORKER-PROFILER-ENABLED)
+ (substitute-childopts (conf WORKER-PROFILER-CHILDOPTS) worker-id storm-id port mem-onheap)
+ "")
topology-worker-environment (if-let [env (storm-conf TOPOLOGY-ENVIRONMENT)]
(merge env {"LD_LIBRARY_PATH" jlp})
{"LD_LIBRARY_PATH" jlp})