storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [4/6] storm git commit: revising documentation and adding additional metrics
Date Fri, 06 Nov 2015 17:08:13 GMT
revising documentation and adding additional metrics


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

Branch: refs/heads/master
Commit: 23f75d973bc242c4c42433cfc518bfd1435cf7d0
Parents: 3586bc3
Author: Boyang Jerry Peng <jerrypeng@yahoo-inc.com>
Authored: Thu Nov 5 10:56:59 2015 -0600
Committer: Boyang Jerry Peng <jerrypeng@yahoo-inc.com>
Committed: Thu Nov 5 11:13:01 2015 -0600

----------------------------------------------------------------------
 .../storm-metrics-profiling-internal-actions.md   |  12 ++++++------
 docs/images/viewing_metrics_with_VisualVM.png     | Bin 0 -> 225100 bytes
 .../src/clj/backtype/storm/daemon/nimbus.clj      |   4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/23f75d97/docs/documentation/storm-metrics-profiling-internal-actions.md
----------------------------------------------------------------------
diff --git a/docs/documentation/storm-metrics-profiling-internal-actions.md b/docs/documentation/storm-metrics-profiling-internal-actions.md
index 266285d..e549c0c 100644
--- a/docs/documentation/storm-metrics-profiling-internal-actions.md
+++ b/docs/documentation/storm-metrics-profiling-internal-actions.md
@@ -44,7 +44,7 @@ Metrics can be reported via JMX or HTTP.  A user can use JConsole or VisualVM
to
 
 To view the metrics in a GUI use VisualVM or JConsole.  Screenshot of using VisualVm for
metrics: 
 
-![alt text](https://dropwizard.github.io/metrics/3.1.0/_images/metrics-visualvm.png)
+![Viewing metrics with VisualVM](images/viewing_metrics_with_VisualVM.png)
 
 For detailed information regarding how to collect the metrics please reference: 
 
@@ -61,10 +61,10 @@ If you want use JMX and view metrics through JConsole or VisualVM, remember
laun
     drpc.childopts: "-Xmx768m -Dcom.sun.management.jmxremote.port=3336 -Dcom.sun.management.jmxremote.local.only=false
-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
    
     supervisor.childopts: "-Xmx256m -Dcom.sun.management.jmxremote.port=3337 -Dcom.sun.management.jmxremote.local.only=false
-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
-    
+
+### Please Note:
+Since we shade all of the packages we use, additional plugins for collecting metrics might
not work at this time.  Currently collecting the metrics via JMX is supported.
+   
 For more information about io.dropwizard.metrics and metrics-clojure packages please reference
their original documentation:
 - https://dropwizard.github.io/metrics/3.1.0/
-- http://metrics-clojure.readthedocs.org/en/latest/
-
-
-
+- http://metrics-clojure.readthedocs.org/en/latest/
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/storm/blob/23f75d97/docs/images/viewing_metrics_with_VisualVM.png
----------------------------------------------------------------------
diff --git a/docs/images/viewing_metrics_with_VisualVM.png b/docs/images/viewing_metrics_with_VisualVM.png
new file mode 100644
index 0000000..5ccd81f
Binary files /dev/null and b/docs/images/viewing_metrics_with_VisualVM.png differ

http://git-wip-us.apache.org/repos/asf/storm/blob/23f75d97/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index 43f1858..75b2c80 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -64,6 +64,8 @@
 (defmeter nimbus:num-activate-calls)
 (defmeter nimbus:num-deactivate-calls)
 (defmeter nimbus:num-debug-calls)
+(defmeter nimbus:num-setWorkerProfiler-calls)
+(defmeter nimbus:num-getComponentPendingProfileActions-calls)
 (defmeter nimbus:num-setLogConfig-calls)
 (defmeter nimbus:num-uploadNewCredentials-calls)
 (defmeter nimbus:num-beginFileUpload-calls)
@@ -1381,6 +1383,7 @@
 
       (^void setWorkerProfiler
         [this ^String id ^ProfileRequest profileRequest]
+        (mark! nimbus:num-setWorkerProfiler-calls)
         (let [topology-conf (try-read-storm-conf conf id)
               storm-name (topology-conf TOPOLOGY-NAME)
               _ (check-authorization! nimbus storm-name topology-conf "setWorkerProfiler")
@@ -1389,6 +1392,7 @@
 
       (^List getComponentPendingProfileActions
         [this ^String id ^String component_id ^ProfileAction action]
+        (mark! nimbus:num-getComponentPendingProfileActions-calls)
         (let [info (get-common-topo-info id "getComponentPendingProfileActions")
               storm-cluster-state (:storm-cluster-state info)
               task->component (:task->component info)


Mime
View raw message