You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/12/06 23:37:04 UTC

[1/2] storm git commit: Updating Trident RAS Documentation.

Repository: storm
Updated Branches:
  refs/heads/1.x-branch ffb051378 -> cce525b2d


Updating Trident RAS Documentation.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c64a1095
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c64a1095
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c64a1095

Branch: refs/heads/1.x-branch
Commit: c64a109529f00e6c9e969b99d8d03a64d2f32069
Parents: ffb0513
Author: Kyle Nusbaum <kn...@yahoo-inc.com>
Authored: Fri Dec 2 13:46:21 2016 -0600
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Dec 7 08:36:49 2016 +0900

----------------------------------------------------------------------
 docs/Trident-RAS-API.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/c64a1095/docs/Trident-RAS-API.md
----------------------------------------------------------------------
diff --git a/docs/Trident-RAS-API.md b/docs/Trident-RAS-API.md
index 969eab8..ce18e02 100644
--- a/docs/Trident-RAS-API.md
+++ b/docs/Trident-RAS-API.md
@@ -16,6 +16,9 @@ First, an example:
 
 ```java
     TridentTopology topo = new TridentTopology();
+    topo.setResourceDefaults(new DefaultResourceDeclarer();
+                                                          .setMemoryLoad(128)
+                                                          .setCPULoad(20));
     TridentState wordCounts =
         topology
             .newStream("words", feeder)
@@ -29,6 +32,7 @@ First, an example:
             .parallelismHint(10)
             .setCPULoad(50)
             .setMemoryLoad(1024)
+            .each(new Fields("word!"), new QMarkAdder(), new Fields("word!?"))
             .groupBy(new Fields("word!"))
             .persistentAggregate(new MemoryMapState.Factory(), new Count(), new Fields("count"))
             .setCPULoad(100)
@@ -44,9 +48,9 @@ In the above case, we end up with
 
 
 - a spout and spout coordinator with a CPU load of 20% each, and a memory load of 512MiB on-heap and 256MiB off-heap.
-- a bolt with 60% cpu load (10% + 50%) and a memory load of 1536MiB (1024 + 512) on-heap from the combined `Split` and `BangAdder`
+- a bolt with 80% cpu load (10% + 50% + 20%) and a memory load of 1664MiB (1024 + 512 + 128) on-heap from the combined `Split` and `BangAdder` and the `QMarkAdder` which used the default resources contained in the DefaultResourceDeclarer
 - a bolt with 100% cpu load and a memory load of 2048MiB on-heap, with default value for off-heap.
 
-The API can be called as many times as is desired.
-It may be called after every operation, after some of the operations, or used in the same manner as `parallelismHint()` to set resources for a whole section.
+Resource declarations may be called after any operation. The operations without explicit resources will get the defaults. If you choose to set resources for only some operations, defaults must be declared, or topology submission will fail.
 Resource declarations have the same *boundaries* as parallelism hints. They don't cross any groupings, shufflings, or any other kind of repartitioning.
+Resources are declared per operation, but get combined within boundaries.


[2/2] storm git commit: Merge branch 'PR-1812-1.x-merge' into 1.x-branch

Posted by ka...@apache.org.
Merge branch 'PR-1812-1.x-merge' into 1.x-branch


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cce525b2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cce525b2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cce525b2

Branch: refs/heads/1.x-branch
Commit: cce525b2df1b2c6a93423700434c52b6a03e66bb
Parents: ffb0513 c64a109
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Dec 7 08:36:57 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Dec 7 08:36:57 2016 +0900

----------------------------------------------------------------------
 docs/Trident-RAS-API.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------