You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2016/07/11 21:22:28 UTC
[1/3] storm git commit: Fix for STORM-1954
Repository: storm
Updated Branches:
refs/heads/master a3edb2c8f -> f258097d1
Fix for STORM-1954
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/55c9e1fc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/55c9e1fc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/55c9e1fc
Branch: refs/heads/master
Commit: 55c9e1fc7d030a0a381af34ba726cf2d4a19e953
Parents: cf2c6bd
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Fri Jul 8 16:22:12 2016 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Fri Jul 8 16:22:12 2016 -0500
----------------------------------------------------------------------
.../apache/storm/trident/operation/DefaultResourceDeclarer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/55c9e1fc/storm-core/src/jvm/org/apache/storm/trident/operation/DefaultResourceDeclarer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/trident/operation/DefaultResourceDeclarer.java b/storm-core/src/jvm/org/apache/storm/trident/operation/DefaultResourceDeclarer.java
index d49011a..b33fc4b 100644
--- a/storm-core/src/jvm/org/apache/storm/trident/operation/DefaultResourceDeclarer.java
+++ b/storm-core/src/jvm/org/apache/storm/trident/operation/DefaultResourceDeclarer.java
@@ -30,7 +30,7 @@ import org.apache.storm.topology.ResourceDeclarer;
public class DefaultResourceDeclarer<T extends DefaultResourceDeclarer> implements ResourceDeclarer<T>, ITridentResource {
private Map<String, Number> resources = new HashMap<>();
- private Map conf = Utils.readStormConfig();
+ private static Map conf = Utils.readStormConfig();
@Override
public T setMemoryLoad(Number onHeap) {
[2/3] storm git commit: Merge branch 'STORM-1954'
Posted by kn...@apache.org.
Merge branch 'STORM-1954'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/aee470dd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aee470dd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aee470dd
Branch: refs/heads/master
Commit: aee470ddd3f04543f5579ec6fd0ebf26c1261cba
Parents: a3edb2c 55c9e1f
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Mon Jul 11 16:15:39 2016 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Mon Jul 11 16:15:39 2016 -0500
----------------------------------------------------------------------
.../apache/storm/trident/operation/DefaultResourceDeclarer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/aee470dd/storm-core/src/jvm/org/apache/storm/trident/operation/DefaultResourceDeclarer.java
----------------------------------------------------------------------
[3/3] storm git commit: Adding STORM-1954 to CHANGELOG.md
Posted by kn...@apache.org.
Adding STORM-1954 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f258097d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f258097d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f258097d
Branch: refs/heads/master
Commit: f258097d14e614c32aa54fb7dced8589a4b5b0f9
Parents: aee470d
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Mon Jul 11 16:16:19 2016 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Mon Jul 11 16:16:19 2016 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f258097d/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95c8517..7b05a75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-1954: Large Trident topologies can cause memory issues due to DefaultResourceDeclarer object reading config
* STORM-1913: Additions and Improvements for Trident RAS API
* STORM-1959: Add missing license header to KafkaPartitionOffsetLag
* STORM-1249: port backtype.storm.security.serialization.BlowfishTupleSerializer-test to java