You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2018/04/02 13:30:20 UTC
[1/2] storm git commit: [STORM-3018] Fix integration test
DemoTest#testExclamationTopology fail problem
Repository: storm
Updated Branches:
refs/heads/master a851badfb -> cb0bfcedd
[STORM-3018] Fix integration test DemoTest#testExclamationTopology fail problem
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/34c18572
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/34c18572
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/34c18572
Branch: refs/heads/master
Commit: 34c1857229a5eb31b53c2801e6b9c6f6a6216583
Parents: a851bad
Author: chenyuzhao <ch...@meituan.com>
Authored: Sun Apr 1 11:08:19 2018 +0800
Committer: chenyuzhao <ch...@meituan.com>
Committed: Sun Apr 1 20:47:21 2018 +0800
----------------------------------------------------------------------
conf/defaults.yaml | 3 +++
integration-test/config/storm.yaml | 4 ++++
integration-test/src/test/java/org/apache/storm/st/DemoTest.java | 1 +
3 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/34c18572/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 2ed4599..8dcb2d9 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -196,6 +196,9 @@ worker.log.level.reset.poll.secs: 30
topology.worker.receiver.thread.count: 1
# Executor metrics reporting interval.
+# Cause the ui only show built in metrics, we should keep sync with the built in metrics interval,
+# also the metrics consumer's collecting interval.
+# See topology.builtin.metrics.bucket.size.secs and storm.cluster.metrics.consumer.publish.interval.secs.
executor.metrics.frequency.secs: 60
task.heartbeat.frequency.secs: 3
http://git-wip-us.apache.org/repos/asf/storm/blob/34c18572/integration-test/config/storm.yaml
----------------------------------------------------------------------
diff --git a/integration-test/config/storm.yaml b/integration-test/config/storm.yaml
index eca352f..67784e7 100644
--- a/integration-test/config/storm.yaml
+++ b/integration-test/config/storm.yaml
@@ -27,6 +27,10 @@ storm.messaging.netty.max_retries: 10
storm.messaging.netty.min_wait_ms: 1000
storm.messaging.netty.max_wait_ms: 5000
+# Executor metrics reporting interval, keep it short enough for cases fetching executors metrics
+# through restful API
+executor.metrics.frequency.secs: 3
+
drpc.servers:
- "node1"
http://git-wip-us.apache.org/repos/asf/storm/blob/34c18572/integration-test/src/test/java/org/apache/storm/st/DemoTest.java
----------------------------------------------------------------------
diff --git a/integration-test/src/test/java/org/apache/storm/st/DemoTest.java b/integration-test/src/test/java/org/apache/storm/st/DemoTest.java
index 133014b..feca17a 100644
--- a/integration-test/src/test/java/org/apache/storm/st/DemoTest.java
+++ b/integration-test/src/test/java/org/apache/storm/st/DemoTest.java
@@ -54,6 +54,7 @@ public final class DemoTest extends AbstractTest {
topo.submitSuccessfully();
final int minExclaim2Emits = 500;
final int minSpountEmits = 10000;
+ //Keep the check time to be gt Config.EXECUTOR_METRICS_FREQUENCY_SECS.
for(int i = 0; i < 10; ++i) {
TopologyInfo topologyInfo = topo.getInfo();
log.info(topologyInfo.toString());
[2/2] storm git commit: Merge branch 'fix-test' of
https://github.com/danny0405/storm into STORM-3018-merge
Posted by sr...@apache.org.
Merge branch 'fix-test' of https://github.com/danny0405/storm into STORM-3018-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cb0bfced
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cb0bfced
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cb0bfced
Branch: refs/heads/master
Commit: cb0bfceddf400bbbff9d8e90942137212f2bd15b
Parents: a851bad 34c1857
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Mon Apr 2 15:22:44 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Mon Apr 2 15:22:44 2018 +0200
----------------------------------------------------------------------
conf/defaults.yaml | 3 +++
integration-test/config/storm.yaml | 4 ++++
integration-test/src/test/java/org/apache/storm/st/DemoTest.java | 1 +
3 files changed, 8 insertions(+)
----------------------------------------------------------------------