You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/05/23 18:16:04 UTC
[2/3] storm git commit: Merge branch 'STORM-2525' of
https://github.com/srdo/storm into STORM-2525
Merge branch 'STORM-2525' of https://github.com/srdo/storm into STORM-2525
STORM-2525: Fix flaky integration tests
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c2bd9f09
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c2bd9f09
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c2bd9f09
Branch: refs/heads/master
Commit: c2bd9f09aadb42c56960aae032de2ea289e83f32
Parents: d67aaf3 1db8674
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Tue May 23 12:57:10 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Tue May 23 12:57:10 2017 -0500
----------------------------------------------------------------------
integration-test/config/Vagrantfile | 8 +-
integration-test/config/cluster.xml | 101 -------------------
integration-test/config/install-storm.sh | 1 -
integration-test/config/install-zookeeper.sh | 3 +-
integration-test/pom.xml | 2 +-
integration-test/run-it.sh | 10 +-
.../topology/window/SlidingTimeCorrectness.java | 4 +-
.../window/SlidingWindowCorrectness.java | 2 -
.../window/TumblingTimeCorrectness.java | 4 +-
.../window/TumblingWindowCorrectness.java | 2 -
.../apache/storm/st/utils/StringDecorator.java | 1 +
.../st/tests/window/SlidingWindowTest.java | 44 ++++----
.../org/apache/storm/st/wrapper/TopoWrap.java | 81 +++++++--------
pom.xml | 23 ++++-
storm-client/pom.xml | 7 +-
.../storm/topology/WindowedBoltExecutor.java | 6 +-
.../apache/storm/windowing/EvictionContext.java | 2 +-
.../apache/storm/windowing/EvictionPolicy.java | 2 +-
.../storm/windowing/TimeEvictionPolicy.java | 2 +-
.../storm/windowing/TimeTriggerPolicy.java | 4 +-
.../windowing/WaterMarkEventGenerator.java | 2 +-
.../windowing/WatermarkCountEvictionPolicy.java | 9 +-
.../windowing/WatermarkTimeEvictionPolicy.java | 9 +-
.../apache/storm/windowing/WindowManager.java | 3 +
.../storm/windowing/WindowManagerTest.java | 48 ++++++++-
25 files changed, 185 insertions(+), 195 deletions(-)
----------------------------------------------------------------------