You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ki...@apache.org on 2016/03/04 17:59:00 UTC
[5/9] storm git commit: Merge branch 'master' of
github.com:apache/storm into storm1528
Merge branch 'master' of github.com:apache/storm into storm1528
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/85504e2b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/85504e2b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/85504e2b
Branch: refs/heads/master
Commit: 85504e2b651363db2b991b00b35e3c866311aa6d
Parents: 81a2876 4ca7522
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Fri Feb 19 15:15:16 2016 -0600
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Feb 19 15:15:16 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 29 +
README.markdown | 2 +
bin/storm-config.cmd | 10 +-
bin/storm.cmd | 69 +-
bin/storm.py | 20 +-
conf/cgconfig.conf.example | 41 +
conf/defaults.yaml | 16 +-
dev-tools/travis/travis-script.sh | 4 +-
examples/storm-starter/pom.xml | 10 +
.../org/apache/storm/starter/clj/word_count.clj | 3 +-
.../starter/ResourceAwareExampleTopology.java | 2 +-
.../spout/RandomNumberGeneratorSpout.java | 95 ++
.../trident/TridentMinMaxOfDevicesTopology.java | 201 ++++
.../TridentMinMaxOfVehiclesTopology.java | 180 +++
external/sql/storm-sql-core/pom.xml | 9 +
external/storm-elasticsearch/pom.xml | 2 +
.../storm/hbase/security/HBaseSecurityUtil.java | 36 +-
external/storm-hdfs/pom.xml | 23 +-
external/storm-mqtt/core/pom.xml | 4 +-
log4j2/cluster.xml | 2 +-
log4j2/worker.xml | 2 +-
pom.xml | 25 +-
storm-clojure/pom.xml | 74 ++
.../src/clj/org/apache/storm/clojure.clj | 207 ++++
.../src/clj/org/apache/storm/thrift.clj | 286 +++++
storm-clojure/src/test/clj/clojure_test.clj | 158 +++
storm-core/pom.xml | 20 +-
.../src/clj/org/apache/storm/LocalCluster.clj | 4 +-
storm-core/src/clj/org/apache/storm/clojure.clj | 201 ----
storm-core/src/clj/org/apache/storm/cluster.clj | 27 +-
.../cluster_state/zookeeper_state_factory.clj | 14 +-
.../clj/org/apache/storm/command/activate.clj | 24 -
.../clj/org/apache/storm/command/blobstore.clj | 11 +-
.../org/apache/storm/command/config_value.clj | 25 -
.../clj/org/apache/storm/command/deactivate.clj | 24 -
.../org/apache/storm/command/dev_zookeeper.clj | 28 -
.../clj/org/apache/storm/command/get_errors.clj | 15 +-
.../org/apache/storm/command/healthcheck.clj | 90 --
.../org/apache/storm/command/kill_topology.clj | 29 -
.../src/clj/org/apache/storm/command/list.clj | 38 -
.../clj/org/apache/storm/command/monitor.clj | 2 +-
.../clj/org/apache/storm/command/rebalance.clj | 3 +-
.../org/apache/storm/command/set_log_level.clj | 3 +-
.../apache/storm/command/shell_submission.clj | 6 +-
storm-core/src/clj/org/apache/storm/config.clj | 18 +-
.../src/clj/org/apache/storm/converter.clj | 14 +-
.../src/clj/org/apache/storm/daemon/acker.clj | 21 +-
.../src/clj/org/apache/storm/daemon/common.clj | 150 +--
.../src/clj/org/apache/storm/daemon/drpc.clj | 23 +-
.../clj/org/apache/storm/daemon/executor.clj | 626 +++++------
.../clj/org/apache/storm/daemon/logviewer.clj | 85 +-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 268 +++--
.../clj/org/apache/storm/daemon/supervisor.clj | 443 +++++---
.../src/clj/org/apache/storm/daemon/task.clj | 6 +-
.../src/clj/org/apache/storm/daemon/worker.clj | 240 ++--
.../src/clj/org/apache/storm/disruptor.clj | 89 --
storm-core/src/clj/org/apache/storm/event.clj | 71 --
.../clj/org/apache/storm/internal/clojure.clj | 201 ++++
.../clj/org/apache/storm/internal/thrift.clj | 96 ++
.../src/clj/org/apache/storm/local_state.clj | 131 ---
.../org/apache/storm/local_state_converter.clj | 24 +
.../clj/org/apache/storm/messaging/loader.clj | 34 -
.../clj/org/apache/storm/messaging/local.clj | 23 -
.../org/apache/storm/pacemaker/pacemaker.clj | 7 +-
.../storm/pacemaker/pacemaker_state_factory.clj | 24 +-
.../clj/org/apache/storm/process_simulator.clj | 4 +-
.../apache/storm/scheduler/DefaultScheduler.clj | 7 +-
.../apache/storm/scheduler/EvenScheduler.clj | 23 +-
.../storm/scheduler/IsolationScheduler.clj | 29 +-
storm-core/src/clj/org/apache/storm/stats.clj | 82 +-
storm-core/src/clj/org/apache/storm/testing.clj | 124 ++-
storm-core/src/clj/org/apache/storm/thrift.clj | 284 -----
storm-core/src/clj/org/apache/storm/timer.clj | 128 ---
.../clj/org/apache/storm/trident/testing.clj | 9 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 103 +-
.../src/clj/org/apache/storm/ui/helpers.clj | 14 +-
storm-core/src/clj/org/apache/storm/util.clj | 923 +---------------
.../src/clj/org/apache/storm/zookeeper.clj | 1 -
storm-core/src/jvm/org/apache/storm/Config.java | 88 ++
.../src/jvm/org/apache/storm/StormTimer.java | 241 +++++
storm-core/src/jvm/org/apache/storm/Thrift.java | 351 ++++++
.../jvm/org/apache/storm/command/Activate.java | 40 +
.../src/jvm/org/apache/storm/command/CLI.java | 353 ++++++
.../org/apache/storm/command/ConfigValue.java | 30 +
.../org/apache/storm/command/Deactivate.java | 40 +
.../org/apache/storm/command/DevZookeeper.java | 35 +
.../org/apache/storm/command/HealthCheck.java | 125 +++
.../org/apache/storm/command/KillTopology.java | 51 +
.../src/jvm/org/apache/storm/command/List.java | 50 +
.../container/ResourceIsolationInterface.java | 51 +
.../storm/container/cgroup/CgroupCenter.java | 216 ++++
.../storm/container/cgroup/CgroupCommon.java | 270 +++++
.../container/cgroup/CgroupCommonOperation.java | 81 ++
.../container/cgroup/CgroupCoreFactory.java | 74 ++
.../storm/container/cgroup/CgroupManager.java | 210 ++++
.../storm/container/cgroup/CgroupOperation.java | 79 ++
.../storm/container/cgroup/CgroupUtils.java | 118 ++
.../apache/storm/container/cgroup/Device.java | 75 ++
.../storm/container/cgroup/Hierarchy.java | 130 +++
.../storm/container/cgroup/SubSystem.java | 81 ++
.../storm/container/cgroup/SubSystemType.java | 36 +
.../storm/container/cgroup/SystemOperation.java | 75 ++
.../storm/container/cgroup/core/BlkioCore.java | 213 ++++
.../storm/container/cgroup/core/CgroupCore.java | 26 +
.../storm/container/cgroup/core/CpuCore.java | 135 +++
.../container/cgroup/core/CpuacctCore.java | 71 ++
.../storm/container/cgroup/core/CpusetCore.java | 209 ++++
.../container/cgroup/core/DevicesCore.java | 189 ++++
.../container/cgroup/core/FreezerCore.java | 66 ++
.../storm/container/cgroup/core/MemoryCore.java | 188 ++++
.../storm/container/cgroup/core/NetClsCore.java | 69 ++
.../container/cgroup/core/NetPrioCore.java | 65 ++
.../org/apache/storm/event/EventManager.java | 24 +
.../org/apache/storm/event/EventManagerImp.java | 97 ++
.../storm/logging/ThriftAccessLogger.java | 13 +-
.../serialization/SerializationFactory.java | 17 +-
.../jvm/org/apache/storm/testing/NGrouping.java | 4 +-
.../storm/testing/PythonShellMetricsBolt.java | 14 +-
.../storm/testing/PythonShellMetricsSpout.java | 8 +-
.../staticmocking/MockedConfigUtils.java | 31 -
.../jvm/org/apache/storm/trident/Stream.java | 121 ++-
.../operation/builtin/ComparisonAggregator.java | 91 ++
.../storm/trident/operation/builtin/Max.java | 37 +
.../operation/builtin/MaxWithComparator.java | 51 +
.../storm/trident/operation/builtin/Min.java | 36 +
.../operation/builtin/MinWithComparator.java | 51 +
.../jvm/org/apache/storm/utils/ConfigUtils.java | 20 +-
.../jvm/org/apache/storm/utils/Container.java | 11 +-
.../org/apache/storm/utils/DisruptorQueue.java | 15 +-
.../jvm/org/apache/storm/utils/IPredicate.java | 27 +
.../jvm/org/apache/storm/utils/LocalState.java | 112 +-
.../org/apache/storm/utils/NimbusClient.java | 21 +-
.../utils/StormConnectionStateConverter.java | 44 +
.../jvm/org/apache/storm/utils/TestUtils.java | 34 -
.../src/jvm/org/apache/storm/utils/Time.java | 26 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 1024 ++++++++++++++++--
.../storm/validation/ConfigValidation.java | 2 +-
.../org/apache/storm/zookeeper/Zookeeper.java | 7 +
.../org/apache/storm/integration_test.clj | 357 +++---
.../org/apache/storm/testing4j_test.clj | 107 +-
.../apache/storm/trident/integration_test.clj | 15 +-
.../test/clj/org/apache/storm/clojure_test.clj | 64 +-
.../test/clj/org/apache/storm/cluster_test.clj | 23 +-
.../test/clj/org/apache/storm/drpc_test.clj | 42 +-
.../test/clj/org/apache/storm/grouping_test.clj | 56 +-
.../clj/org/apache/storm/logviewer_test.clj | 267 ++---
.../storm/messaging/netty_integration_test.clj | 18 +-
.../clj/org/apache/storm/messaging_test.clj | 14 +-
.../test/clj/org/apache/storm/metrics_test.clj | 85 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 389 ++++---
.../scheduler/resource_aware_scheduler_test.clj | 22 +-
.../apache/storm/security/auth/auth_test.clj | 11 +-
.../authorizer/DRPCSimpleACLAuthorizer_test.clj | 2 +-
.../BlowfishTupleSerializer_test.clj | 1 -
.../clj/org/apache/storm/serialization_test.clj | 23 +-
.../clj/org/apache/storm/supervisor_test.clj | 564 ++++++----
.../clj/org/apache/storm/tick_tuple_test.clj | 15 +-
.../clj/org/apache/storm/transactional_test.clj | 21 +-
.../clj/org/apache/storm/trident/state_test.clj | 5 +-
.../clj/org/apache/storm/trident/tuple_test.clj | 15 +-
.../test/clj/org/apache/storm/utils_test.clj | 16 +-
.../test/clj/org/apache/storm/worker_test.clj | 1 -
.../test/jvm/org/apache/storm/TestCgroups.java | 130 +++
.../jvm/org/apache/storm/command/TestCLI.java | 59 +
.../resource/TestResourceAwareScheduler.java | 3 +
.../staticmocking/ConfigUtilsInstaller.java | 38 +
.../utils/staticmocking/UtilsInstaller.java | 38 +
.../storm/utils/staticmocking/package-info.java | 95 ++
168 files changed, 10733 insertions(+), 4231 deletions(-)
----------------------------------------------------------------------