Merge branch 'STORM-162' of https://github.com/revans2/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/68d72b32 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/68d72b32 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/68d72b32 Branch: refs/heads/master Commit: 68d72b32c5fb33923c6169d2100087028a6ec8ce Parents: 795edec 024ff26 Author: Kishor Patil <[email protected]> Authored: Fri Nov 6 17:43:42 2015 +0000 Committer: Kishor Patil <[email protected]> Committed: Fri Nov 6 17:43:42 2015 +0000 ---------------------------------------------------------------------- conf/defaults.yaml | 1 + .../src/clj/backtype/storm/daemon/executor.clj | 54 +++-- .../src/clj/backtype/storm/daemon/task.clj | 4 +- .../src/clj/backtype/storm/daemon/worker.clj | 31 +++ .../src/clj/backtype/storm/messaging/local.clj | 34 ++- storm-core/src/clj/backtype/storm/timer.clj | 20 +- storm-core/src/jvm/backtype/storm/Config.java | 7 + .../src/jvm/backtype/storm/grouping/Load.java | 77 ++++++ .../grouping/LoadAwareCustomStreamGrouping.java | 24 ++ .../grouping/LoadAwareShuffleGrouping.java | 76 ++++++ .../backtype/storm/grouping/LoadMapping.java | 64 +++++ .../storm/grouping/ShuffleGrouping.java | 65 ++++++ .../backtype/storm/messaging/IConnection.java | 16 ++ .../backtype/storm/messaging/netty/Client.java | 100 ++++++-- .../storm/messaging/netty/ISaslClient.java | 28 +++ .../storm/messaging/netty/ISaslServer.java | 26 +++ .../backtype/storm/messaging/netty/IServer.java | 26 +++ .../messaging/netty/SaslStormClientHandler.java | 37 +-- .../backtype/storm/messaging/netty/Server.java | 75 ++++-- .../messaging/netty/StormClientHandler.java | 51 +++- .../netty/StormClientPipelineFactory.java | 11 +- .../test/clj/backtype/storm/grouping_test.clj | 90 +++++-- .../clj/backtype/storm/integration_test.clj | 4 +- .../storm/messaging/netty_integration_test.clj | 3 +- .../storm/messaging/netty_unit_test.clj | 232 ++++++++++++++++--- .../test/clj/backtype/storm/messaging_test.clj | 3 +- 26 files changed, 1013 insertions(+), 146 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/68d72b32/conf/defaults.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/68d72b32/storm-core/src/clj/backtype/storm/daemon/worker.clj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/68d72b32/storm-core/src/jvm/backtype/storm/Config.java ----------------------------------------------------------------------
