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/09/14 15:32:16 UTC
[2/2] storm git commit: Merge branch 'STORM-2733' of
https://github.com/revans2/incubator-storm into STORM-2733
Merge branch 'STORM-2733' of https://github.com/revans2/incubator-storm into STORM-2733
STORM-2733: Better load aware shuffle implementation
This closes #2321
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/124acb92
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/124acb92
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/124acb92
Branch: refs/heads/master
Commit: 124acb92dff04a57b530ab4d95a698abc8ff46d9
Parents: 7901051 b9f1d7e
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu Sep 14 10:15:16 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu Sep 14 10:15:16 2017 -0500
----------------------------------------------------------------------
examples/storm-loadgen/README.md | 5 +
examples/storm-loadgen/pom.xml | 2 +-
.../loadgen/ExecAndProcessLatencyEngine.java | 119 ++++++++++++++
.../java/org/apache/storm/loadgen/GenLoad.java | 25 +++
.../java/org/apache/storm/loadgen/LoadBolt.java | 63 +------
.../org/apache/storm/loadgen/LoadCompConf.java | 43 ++++-
.../apache/storm/loadgen/LoadMetricsServer.java | 4 +-
.../apache/storm/loadgen/NormalDistStats.java | 2 +-
.../org/apache/storm/loadgen/OutputStream.java | 2 +-
.../storm/loadgen/SlowExecutorPattern.java | 83 ++++++++++
.../storm/loadgen/ThroughputVsLatency.java | 47 +++++-
.../apache/storm/loadgen/TopologyLoadConf.java | 27 ++-
.../src/jvm/org/apache/storm/daemon/Task.java | 2 -
.../org/apache/storm/daemon/worker/Worker.java | 2 +-
.../apache/storm/daemon/worker/WorkerState.java | 22 ++-
.../jvm/org/apache/storm/executor/Executor.java | 10 +-
.../apache/storm/executor/ExecutorShutdown.java | 18 +-
.../apache/storm/executor/IRunningExecutor.java | 3 +
.../storm/executor/bolt/BoltExecutor.java | 4 +-
.../storm/executor/spout/SpoutExecutor.java | 4 +-
.../grouping/LoadAwareShuffleGrouping.java | 129 +++++++--------
.../grouping/LoadAwareShuffleGroupingTest.java | 163 +++++++------------
22 files changed, 512 insertions(+), 267 deletions(-)
----------------------------------------------------------------------