You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by pe...@apache.org on 2017/08/30 06:58:07 UTC
[1/3] beam git commit: jstorm-runner: Fix the bug that max waiting
time is missing on local mode
Repository: beam
Updated Branches:
refs/heads/jstorm-runner e00e0e841 -> 914889925
jstorm-runner: Fix the bug that max waiting time is missing on local mode
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/557d7036
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/557d7036
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/557d7036
Branch: refs/heads/jstorm-runner
Commit: 557d7036efe3bcb83ea99ca14ad052052bab5add
Parents: e00e0e8
Author: basti.lj <ba...@alibaba-inc.com>
Authored: Wed Aug 30 10:45:17 2017 +0800
Committer: Pei He <pe...@apache.org>
Committed: Wed Aug 30 14:55:15 2017 +0800
----------------------------------------------------------------------
.../java/org/apache/beam/runners/jstorm/JStormRunnerResult.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/557d7036/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/JStormRunnerResult.java
----------------------------------------------------------------------
diff --git a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/JStormRunnerResult.java b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/JStormRunnerResult.java
index 4b1850e..b6b5281 100644
--- a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/JStormRunnerResult.java
+++ b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/JStormRunnerResult.java
@@ -64,8 +64,8 @@ public abstract class JStormRunnerResult implements PipelineResult {
private static class LocalJStormPipelineResult extends JStormRunnerResult {
- private LocalCluster localCluster;
- private long localModeExecuteTimeSecs;
+ private final LocalCluster localCluster;
+ private final long localModeExecuteTimeSecs;
LocalJStormPipelineResult(
String topologyName,
@@ -74,6 +74,7 @@ public abstract class JStormRunnerResult implements PipelineResult {
long localModeExecuteTimeSecs) {
super(topologyName, config);
this.localCluster = checkNotNull(localCluster, "localCluster");
+ this.localModeExecuteTimeSecs = localModeExecuteTimeSecs;
}
@Override
[3/3] beam git commit: This closes #3789
Posted by pe...@apache.org.
This closes #3789
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/91488992
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/91488992
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/91488992
Branch: refs/heads/jstorm-runner
Commit: 9148899254ea873b4a2c5f3314fa30c3b633cea9
Parents: e00e0e8 c952686
Author: Pei He <pe...@apache.org>
Authored: Wed Aug 30 14:57:48 2017 +0800
Committer: Pei He <pe...@apache.org>
Committed: Wed Aug 30 14:57:48 2017 +0800
----------------------------------------------------------------------
.../java/org/apache/beam/runners/jstorm/JStormRunnerResult.java | 5 +++--
.../apache/beam/runners/jstorm/translation/MetricsReporter.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/3] beam git commit: jstorm-runner: Fix incorrect updating of
counter metrics
Posted by pe...@apache.org.
jstorm-runner: Fix incorrect updating of counter metrics
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/c9526869
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/c9526869
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/c9526869
Branch: refs/heads/jstorm-runner
Commit: c95268691f78a629866f722df1a3f7ef5e76a256
Parents: 557d703
Author: basti.lj <ba...@alibaba-inc.com>
Authored: Wed Aug 30 10:45:45 2017 +0800
Committer: Pei He <pe...@apache.org>
Committed: Wed Aug 30 14:55:17 2017 +0800
----------------------------------------------------------------------
.../apache/beam/runners/jstorm/translation/MetricsReporter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/c9526869/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/MetricsReporter.java
----------------------------------------------------------------------
diff --git a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/MetricsReporter.java b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/MetricsReporter.java
index e7f3285..0315a59 100644
--- a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/MetricsReporter.java
+++ b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/MetricsReporter.java
@@ -72,7 +72,7 @@ class MetricsReporter {
AsmCounter counter = metricClient.registerCounter(metricName);
Long incValue = (oldValue == null ? updateValue : updateValue - oldValue);
counter.update(incValue);
- reportedCounters.put(metricName, incValue);
+ reportedCounters.put(metricName, updateValue);
}
}
}