Merge branch 'master' of github.com:apache/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3812b2fa Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3812b2fa Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3812b2fa Branch: refs/heads/master Commit: 3812b2fa04cc7eb86035d402f3c407af3b4daffe Parents: a48e953 e14f429 Author: xiaojian.fxj <[email protected]> Authored: Wed Mar 30 16:56:12 2016 +0800 Committer: xiaojian.fxj <[email protected]> Committed: Wed Mar 30 16:56:12 2016 +0800 ---------------------------------------------------------------------- CHANGELOG.md | 4 + bin/storm.py | 2 +- docs/README.md | 14 +- docs/Resource_Aware_Scheduler_overview.md | 2 + docs/Trident-RAS-API.md | 52 ++ docs/index.md | 1 + .../org/apache/storm/hive/bolt/HiveBolt.java | 147 ++-- .../apache/storm/hive/common/HiveOptions.java | 8 +- .../org/apache/storm/hive/common/HiveUtils.java | 11 +- .../apache/storm/hive/common/HiveWriter.java | 127 ++-- .../apache/storm/hive/trident/HiveState.java | 38 +- .../storm/hive/trident/HiveStateFactory.java | 1 + .../apache/storm/hive/trident/HiveUpdater.java | 1 + .../storm/hive/bolt/BucketTestHiveTopology.java | 190 +++++ .../apache/storm/hive/bolt/HiveTopology.java | 6 +- .../apache/storm/hive/bolt/TestHiveBolt.java | 11 +- .../storm/hive/common/TestHiveWriter.java | 13 +- .../storm/hive/trident/TridentHiveTopology.java | 2 +- .../org/apache/storm/pacemaker/pacemaker.clj | 242 ------ storm-core/src/jvm/org/apache/storm/Config.java | 2 +- .../cluster/PaceMakerStateStorageFactory.java | 3 +- .../storm/metric/StormMetricsRegistry.java | 16 +- .../org/apache/storm/pacemaker/Pacemaker.java | 217 ++++++ .../jvm/org/apache/storm/scheduler/Cluster.java | 23 +- .../org/apache/storm/scheduler/Topologies.java | 11 +- .../scheduler/resource/ClusterStateData.java | 101 --- .../resource/ResourceAwareScheduler.java | 138 ++-- .../scheduler/resource/SchedulingState.java | 56 ++ .../apache/storm/scheduler/resource/User.java | 24 +- .../eviction/DefaultEvictionStrategy.java | 10 +- .../strategies/eviction/IEvictionStrategy.java | 9 +- .../DefaultSchedulingPriorityStrategy.java | 9 +- .../priority/ISchedulingPriorityStrategy.java | 9 +- .../DefaultResourceAwareStrategy.java | 86 +-- .../strategies/scheduling/IStrategy.java | 6 +- .../jvm/org/apache/storm/utils/ConfigUtils.java | 20 +- .../storm/pacemaker_state_factory_test.clj | 151 ---- .../clj/org/apache/storm/pacemaker_test.clj | 242 ------ .../scheduler/resource_aware_scheduler_test.clj | 738 ------------------- .../storm/PaceMakerStateStorageFactoryTest.java | 136 ++++ .../jvm/org/apache/storm/PacemakerTest.java | 242 ++++++ .../resource/TestResourceAwareScheduler.java | 725 +++++++++++++++++- .../TestUtilsForResourceAwareScheduler.java | 43 +- 43 files changed, 2069 insertions(+), 1820 deletions(-) ----------------------------------------------------------------------
