You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/01/20 23:15:46 UTC
[44/46] storm git commit: adds comments about licensing the profiler
feature
adds comments about licensing the profiler feature
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9b5a1bf0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9b5a1bf0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9b5a1bf0
Branch: refs/heads/master
Commit: 9b5a1bf055a237cfa339c9ab0a7a8af56d6efb32
Parents: 67d9181
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Jan 14 16:44:14 2016 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Wed Jan 20 15:19:35 2016 -0600
----------------------------------------------------------------------
conf/defaults.yaml | 6 +++++-
storm-core/src/jvm/org/apache/storm/Config.java | 4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9b5a1bf0/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 8722a5f..8873d12 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -166,8 +166,12 @@ supervisor.cpu.capacity: 400.0
worker.heap.memory.mb: 768
worker.childopts: "-Xmx%HEAP-MEM%m -XX:+PrintGCDetails -Xloggc:artifacts/gc.log -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=1M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=artifacts/heapdump"
worker.gc.childopts: ""
-worker.profiler.childopts: "-XX:+UnlockCommercialFeatures -XX:+FlightRecorder"
+
+# Unlocking commercial features requires a special license from Oracle.
+# See http://www.oracle.com/technetwork/java/javase/terms/products/index.html
+# For this reason, profiler features are disabled by default.
worker.profiler.enabled: false
+worker.profiler.childopts: "-XX:+UnlockCommercialFeatures -XX:+FlightRecorder"
worker.profiler.command: "flight.bash"
worker.heartbeat.frequency.secs: 1
http://git-wip-us.apache.org/repos/asf/storm/blob/9b5a1bf0/storm-core/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/Config.java b/storm-core/src/jvm/org/apache/storm/Config.java
index e1f2281..66c330f 100644
--- a/storm-core/src/jvm/org/apache/storm/Config.java
+++ b/storm-core/src/jvm/org/apache/storm/Config.java
@@ -1374,7 +1374,9 @@ public class Config extends HashMap<String, Object> {
public static final String WORKER_PROFILER_CHILDOPTS = "worker.profiler.childopts";
/**
- * This configuration would enable or disable component page profiing and debugging for workers.
+ * Enable profiling of worker JVMs using Oracle's Java Flight Recorder.
+ * Unlocking commercial features requires a special license from Oracle.
+ * See http://www.oracle.com/technetwork/java/javase/terms/products/index.html
*/
@isBoolean
public static final String WORKER_PROFILER_ENABLED = "worker.profiler.enabled";