You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by da...@apache.org on 2015/09/14 21:50:39 UTC
[1/2] incubator-apex-core git commit: APEX-117 #resolve metrics
aggregation triggered within app window
Repository: incubator-apex-core
Updated Branches:
refs/heads/devel-3 efaa8f282 -> 5e1d54115
APEX-117 #resolve metrics aggregation triggered within app window
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/77e693c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/77e693c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/77e693c2
Branch: refs/heads/devel-3
Commit: 77e693c26962f90803b87212a512bfc3dd03c96b
Parents: 760039e
Author: Chandni Singh <cs...@apache.org>
Authored: Mon Sep 14 00:41:32 2015 -0700
Committer: Chandni Singh <cs...@apache.org>
Committed: Mon Sep 14 11:40:20 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/stram/StreamingContainerManager.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/77e693c2/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java b/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java
index 41738f4..6f36be6 100644
--- a/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java
+++ b/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java
@@ -842,6 +842,10 @@ public class StreamingContainerManager implements PlanContext
metricPool.add(physicalMetrics);
}
}
+ if (metricPool.isEmpty()) {
+ //nothing to aggregate
+ continue;
+ }
Map<String, Object> lm = aggregator.aggregate(windowId, metricPool);
if (lm != null && lm.size() > 0) {
[2/2] incubator-apex-core git commit: Merge branch 'APEX-117' of
https://github.com/chandnisingh/incubator-apex-core into devel-3
Posted by da...@apache.org.
Merge branch 'APEX-117' of https://github.com/chandnisingh/incubator-apex-core into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/5e1d5411
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/5e1d5411
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/5e1d5411
Branch: refs/heads/devel-3
Commit: 5e1d541154639372c62143e8f990762183721d14
Parents: efaa8f2 77e693c
Author: David Yan <da...@datatorrent.com>
Authored: Mon Sep 14 12:50:00 2015 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Mon Sep 14 12:50:00 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/stram/StreamingContainerManager.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------