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 2017/04/13 21:59:55 UTC
[1/4] storm git commit: [STORM-2471] Add metric for thread count.
Repository: storm
Updated Branches:
refs/heads/master 1a17f7416 -> 4a3a238dc
[STORM-2471] Add metric for thread count.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/122d6453
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/122d6453
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/122d6453
Branch: refs/heads/master
Commit: 122d64534772c8467620b615d68eeff4dd24534e
Parents: d8368b0
Author: Jacob Tolar <jt...@yahoo-inc.com>
Authored: Wed Apr 12 12:02:43 2017 -0500
Committer: Jacob Tolar <jt...@yahoo-inc.com>
Committed: Wed Apr 12 12:05:07 2017 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
.../jvm/org/apache/storm/metric/SystemBolt.java | 18 +++++-------------
2 files changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/122d6453/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10655bc..4f1cc32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
\ufeff## 2.0.0
+ * STORM-2471: add new metric for thread count per worker
* STORM-2463: fix DRPCTest.testDequeueAfterTimeout test failure
* STORM-2447: add in storm local to avoid having server on worker classpath
* STORM-2458: Kafka Spout should allow hooking up custom logic when retries have exhanusted
http://git-wip-us.apache.org/repos/asf/storm/blob/122d6453/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java b/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
index 0613208..f1426f7 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
@@ -22,6 +22,7 @@ import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
import java.lang.management.MemoryUsage;
import java.lang.management.RuntimeMXBean;
+import java.lang.management.ThreadMXBean;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;
@@ -99,20 +100,11 @@ public class SystemBolt implements IBolt {
int bucketSize = ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_BUILTIN_METRICS_BUCKET_SIZE_SECS));
final RuntimeMXBean jvmRT = ManagementFactory.getRuntimeMXBean();
+ context.registerMetric("uptimeSecs", () -> jvmRT.getUptime()/1000.0, bucketSize);
+ context.registerMetric("startTimeSecs", () -> jvmRT.getStartTime()/1000.0, bucketSize);
- context.registerMetric("uptimeSecs", new IMetric() {
- @Override
- public Object getValueAndReset() {
- return jvmRT.getUptime()/1000.0;
- }
- }, bucketSize);
-
- context.registerMetric("startTimeSecs", new IMetric() {
- @Override
- public Object getValueAndReset() {
- return jvmRT.getStartTime()/1000.0;
- }
- }, bucketSize);
+ final ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
+ context.registerMetric("threadCount", threadBean::getThreadCount, bucketSize);
context.registerMetric("newWorkerEvent", new IMetric() {
boolean doEvent = true;
[2/4] storm git commit: Update CHANGELOG.md
Posted by bo...@apache.org.
Update CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7327924a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7327924a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7327924a
Branch: refs/heads/master
Commit: 7327924a4171aab3d9e30cfea307ba62f063d44e
Parents: 122d645
Author: jacobtolar <ac...@sheckel.net>
Authored: Thu Apr 13 15:03:49 2017 -0500
Committer: GitHub <no...@github.com>
Committed: Thu Apr 13 15:03:49 2017 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7327924a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f1cc32..10655bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,4 @@
\ufeff## 2.0.0
- * STORM-2471: add new metric for thread count per worker
* STORM-2463: fix DRPCTest.testDequeueAfterTimeout test failure
* STORM-2447: add in storm local to avoid having server on worker classpath
* STORM-2458: Kafka Spout should allow hooking up custom logic when retries have exhanusted
[4/4] storm git commit: Added STORM-2471 to changelog
Posted by bo...@apache.org.
Added STORM-2471 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4a3a238d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4a3a238d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4a3a238d
Branch: refs/heads/master
Commit: 4a3a238dcc29f19720bc3c05f51b7f4df9bfaf8e
Parents: 45cd82a
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu Apr 13 16:33:33 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu Apr 13 16:33:33 2017 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4a3a238d/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index edf384d..f52322e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
\ufeff## 2.0.0
+ * STORM-2471: Add metric for thread count
* STORM-1114: Race condition in trident zookeeper zk-node create/delete
* STORM-2469: fix integration-test dependencies issue
* STORM-2455: Expose the window start and end timestamp in TupleWindow
[3/4] storm git commit: Merge branch 'STORM-2471' of
https://github.com/jacobtolar/storm into STORM-2471
Posted by bo...@apache.org.
Merge branch 'STORM-2471' of https://github.com/jacobtolar/storm into STORM-2471
STORM-2471: Add metric for thread count
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/45cd82a0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/45cd82a0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/45cd82a0
Branch: refs/heads/master
Commit: 45cd82a06b0035d67398262a036c9c7c4ba1997d
Parents: 1a17f74 7327924
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu Apr 13 16:33:08 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu Apr 13 16:33:08 2017 -0500
----------------------------------------------------------------------
.../jvm/org/apache/storm/metric/SystemBolt.java | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------