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 2018/02/24 11:10:36 UTC
[1/2] storm git commit: [STORM-2969] remove @isDerivedFrom validation
for topology.spout/bolt/backpressure.wait.strategy
Repository: storm
Updated Branches:
refs/heads/master 4ace62f2d -> d6d4ff1b2
[STORM-2969] remove @isDerivedFrom validation for topology.spout/bolt/backpressure.wait.strategy
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6f40bd7c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6f40bd7c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6f40bd7c
Branch: refs/heads/master
Commit: 6f40bd7cbc0419240bcec7b8525ef7b7bf57cf3a
Parents: 4ace62f
Author: Ethan Li <et...@gmail.com>
Authored: Wed Feb 21 15:31:32 2018 -0600
Committer: Ethan Li <et...@gmail.com>
Committed: Wed Feb 21 15:31:32 2018 -0600
----------------------------------------------------------------------
storm-client/src/jvm/org/apache/storm/Config.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6f40bd7c/storm-client/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/Config.java b/storm-client/src/jvm/org/apache/storm/Config.java
index ab427d2..7a286d5 100644
--- a/storm-client/src/jvm/org/apache/storm/Config.java
+++ b/storm-client/src/jvm/org/apache/storm/Config.java
@@ -866,9 +866,10 @@ public class Config extends HashMap<String, Object> {
*
* 1. nextTuple emits no tuples
* 2. The spout has hit maxSpoutPending and can't emit any more tuples
+ *
+ * This class must implement {@link IWaitStrategy}.
*/
@isString
- @isDerivedFrom(baseType = IWaitStrategy.class)
public static final String TOPOLOGY_SPOUT_WAIT_STRATEGY = "topology.spout.wait.strategy";
/**
@@ -903,9 +904,9 @@ public class Config extends HashMap<String, Object> {
/**
* Selects the Bolt's Wait Strategy to use when there are no incoming msgs. Used to trade off latency vs CPU usage.
+ * This class must implement {@link IWaitStrategy}.
*/
@isString
- @isDerivedFrom(baseType = IWaitStrategy.class)
public static final String TOPOLOGY_BOLT_WAIT_STRATEGY = "topology.bolt.wait.strategy";
/**
@@ -945,9 +946,10 @@ public class Config extends HashMap<String, Object> {
*
* 1. nextTuple emits no tuples
* 2. The spout has hit maxSpoutPending and can't emit any more tuples
+ *
+ * This class must implement {@link IWaitStrategy}.
*/
@isString
- @isDerivedFrom(baseType = IWaitStrategy.class)
public static final String TOPOLOGY_BACKPRESSURE_WAIT_STRATEGY="topology.backpressure.wait.strategy";
/**
[2/2] storm git commit: Merge branch 'STORM-2969' of
https://github.com/Ethanlm/storm into STORM-2969-merge
Posted by ka...@apache.org.
Merge branch 'STORM-2969' of https://github.com/Ethanlm/storm into STORM-2969-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d6d4ff1b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d6d4ff1b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d6d4ff1b
Branch: refs/heads/master
Commit: d6d4ff1b2381289440c864347eac6cd9a36714a7
Parents: 4ace62f 6f40bd7
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Feb 24 20:10:13 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Feb 24 20:10:13 2018 +0900
----------------------------------------------------------------------
storm-client/src/jvm/org/apache/storm/Config.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------