storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [03/12] storm git commit: Merge branch 'master' into LocalDRPC
Date Wed, 09 Mar 2016 15:53:56 GMT
Merge branch 'master' into LocalDRPC


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9178b1c8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9178b1c8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9178b1c8

Branch: refs/heads/master
Commit: 9178b1c8fb7a77dde0608a285d9adc8d0b767867
Parents: 2854d9e 73312ad
Author: xiaojian.fxj <xiaojian.fxj@alibaba-inc.com>
Authored: Fri Feb 26 14:13:23 2016 +0800
Committer: xiaojian.fxj <xiaojian.fxj@alibaba-inc.com>
Committed: Fri Feb 26 14:13:23 2016 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |  30 +-
 README.markdown                                 |   4 +-
 bin/flight.bash                                 |   4 +-
 bin/storm.cmd                                   |   4 +-
 bin/storm.py                                    |  10 +-
 conf/cgconfig.conf.example                      |  41 ++
 conf/defaults.yaml                              |  20 +-
 examples/storm-starter/pom.xml                  |  10 +
 .../org/apache/storm/starter/clj/word_count.clj |   3 +-
 .../starter/ResourceAwareExampleTopology.java   |   2 +-
 external/storm-hdfs/pom.xml                     |  23 +-
 .../storm/hdfs/bolt/AbstractHdfsBolt.java       |  10 +-
 .../storm/hdfs/bolt/AvroGenericRecordBolt.java  |   8 +-
 .../org/apache/storm/hdfs/bolt/HdfsBolt.java    |   8 +-
 .../storm/hdfs/bolt/SequenceFileBolt.java       |   8 +-
 .../org/apache/storm/kafka/IntSerializer.java   |  10 +-
 .../apache/storm/kafka/PartitionManager.java    |   5 +-
 .../kafka/trident/TridentKafkaEmitter.java      |   5 +-
 pom.xml                                         |  10 +
 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/src/clj/org/apache/storm/clojure.clj | 207 ------
 storm-core/src/clj/org/apache/storm/cluster.clj | 700 -------------------
 .../cluster_state/zookeeper_state_factory.clj   | 165 -----
 .../org/apache/storm/command/dev_zookeeper.clj  |  28 -
 .../clj/org/apache/storm/command/get_errors.clj |   3 +-
 .../org/apache/storm/command/healthcheck.clj    |  90 ---
 .../clj/org/apache/storm/command/heartbeats.clj |   6 +-
 .../clj/org/apache/storm/command/monitor.clj    |  37 -
 .../clj/org/apache/storm/command/rebalance.clj  |  46 --
 .../org/apache/storm/command/set_log_level.clj  |  75 --
 .../apache/storm/command/shell_submission.clj   |   2 +-
 .../src/clj/org/apache/storm/converter.clj      |  23 +-
 .../src/clj/org/apache/storm/daemon/common.clj  | 133 ++--
 .../src/clj/org/apache/storm/daemon/drpc.clj    |  38 +-
 .../clj/org/apache/storm/daemon/executor.clj    |  63 +-
 .../clj/org/apache/storm/daemon/logviewer.clj   |  84 ++-
 .../src/clj/org/apache/storm/daemon/nimbus.clj  | 267 +++----
 .../clj/org/apache/storm/daemon/supervisor.clj  | 291 +++++---
 .../src/clj/org/apache/storm/daemon/task.clj    |   4 +-
 .../src/clj/org/apache/storm/daemon/worker.clj  | 180 ++---
 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    | 134 ----
 .../org/apache/storm/local_state_converter.clj  |  24 +
 .../storm/pacemaker/pacemaker_state_factory.clj | 141 ----
 .../clj/org/apache/storm/process_simulator.clj  |  49 --
 storm-core/src/clj/org/apache/storm/stats.clj   |   3 +-
 storm-core/src/clj/org/apache/storm/testing.clj |  56 +-
 storm-core/src/clj/org/apache/storm/thrift.clj  | 286 --------
 storm-core/src/clj/org/apache/storm/timer.clj   | 128 ----
 storm-core/src/clj/org/apache/storm/ui/core.clj | 134 ++--
 .../src/clj/org/apache/storm/ui/helpers.clj     | 199 +-----
 storm-core/src/clj/org/apache/storm/util.clj    |  11 +
 .../src/clj/org/apache/storm/zookeeper.clj      |  74 --
 storm-core/src/jvm/org/apache/storm/Config.java |  97 +++
 .../jvm/org/apache/storm/ProcessSimulator.java  |  82 +++
 .../src/jvm/org/apache/storm/StormTimer.java    | 241 +++++++
 storm-core/src/jvm/org/apache/storm/Thrift.java | 351 ++++++++++
 .../jvm/org/apache/storm/callback/Callback.java |  23 -
 .../storm/callback/ZKStateChangedCallback.java  |  25 +
 .../org/apache/storm/cluster/ClusterState.java  | 217 ------
 .../storm/cluster/ClusterStateContext.java      |   2 +-
 .../storm/cluster/ClusterStateFactory.java      |  28 -
 .../org/apache/storm/cluster/ClusterUtils.java  | 244 +++++++
 .../org/apache/storm/cluster/ExecutorBeat.java  |  44 ++
 .../org/apache/storm/cluster/IStateStorage.java | 222 ++++++
 .../storm/cluster/IStormClusterState.java       | 124 ++++
 .../storm/cluster/PaceMakerStateStorage.java    | 216 ++++++
 .../cluster/PaceMakerStateStorageFactory.java   |  64 ++
 .../storm/cluster/StateStorageFactory.java      |  28 +
 .../storm/cluster/StormClusterStateImpl.java    | 692 ++++++++++++++++++
 .../apache/storm/cluster/ZKStateStorage.java    | 244 +++++++
 .../storm/cluster/ZKStateStorageFactory.java    |  36 +
 .../src/jvm/org/apache/storm/command/CLI.java   |  34 +-
 .../org/apache/storm/command/DevZookeeper.java  |  35 +
 .../org/apache/storm/command/HealthCheck.java   | 125 ++++
 .../jvm/org/apache/storm/command/Monitor.java   |  65 ++
 .../jvm/org/apache/storm/command/Rebalance.java |  86 +++
 .../org/apache/storm/command/SetLogLevel.java   | 116 +++
 .../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/metric/FileBasedEventLogger.java      |  18 +-
 .../apache/storm/pacemaker/PacemakerClient.java |   6 +-
 .../security/auth/ThriftConnectionType.java     |   2 +-
 .../serialization/SerializationFactory.java     |   2 +
 .../jvm/org/apache/storm/testing/NGrouping.java |   4 +-
 .../storm/testing/PythonShellMetricsBolt.java   |  14 +-
 .../storm/testing/PythonShellMetricsSpout.java  |   8 +-
 .../testing/staticmocking/MockedCluster.java    |  31 +
 .../MockedPaceMakerStateStorageFactory.java     |  32 +
 .../apache/storm/trident/tuple/ConsList.java    |  20 +-
 .../apache/storm/ui/FilterConfiguration.java    |  63 ++
 .../jvm/org/apache/storm/ui/IConfigurator.java  |  24 +
 .../src/jvm/org/apache/storm/ui/UIHelpers.java  | 267 +++++++
 .../jvm/org/apache/storm/utils/LocalState.java  | 112 ++-
 .../src/jvm/org/apache/storm/utils/Time.java    |   1 +
 .../src/jvm/org/apache/storm/utils/Utils.java   |  95 ++-
 .../storm/utils/WorkerBackpressureCallback.java |   2 +-
 .../storm/utils/WorkerBackpressureThread.java   |  38 +-
 .../org/apache/storm/zookeeper/Zookeeper.java   |  77 +-
 storm-core/src/ui/public/component.html         |   2 +-
 .../templates/topology-page-template.html       |   6 +-
 storm-core/src/ui/public/topology.html          |   2 +-
 .../org/apache/storm/integration_test.clj       | 270 +++----
 .../org/apache/storm/testing4j_test.clj         |  72 +-
 .../test/clj/org/apache/storm/clojure_test.clj  |  64 +-
 .../test/clj/org/apache/storm/cluster_test.clj  | 203 +++---
 .../test/clj/org/apache/storm/drpc_test.clj     |  23 +-
 .../test/clj/org/apache/storm/grouping_test.clj |  56 +-
 .../storm/messaging/netty_integration_test.clj  |  19 +-
 .../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   | 414 ++++++-----
 .../storm/pacemaker_state_factory_test.clj      | 121 ++--
 .../scheduler/resource_aware_scheduler_test.clj |   3 +-
 .../storm/security/auth/nimbus_auth_test.clj    |   3 +-
 .../clj/org/apache/storm/supervisor_test.clj    |  80 ++-
 .../clj/org/apache/storm/tick_tuple_test.clj    |  15 +-
 .../clj/org/apache/storm/transactional_test.clj |   3 +-
 .../test/clj/org/apache/storm/utils_test.clj    | 111 ---
 .../test/jvm/org/apache/storm/TestCgroups.java  | 130 ++++
 .../org/apache/storm/command/RebalanceTest.java |  41 ++
 .../apache/storm/command/SetLogLevelTest.java   |  54 ++
 .../jvm/org/apache/storm/command/TestCLI.java   |  44 +-
 .../resource/TestResourceAwareScheduler.java    |   3 +
 .../jvm/org/apache/storm/utils/TimeTest.java    | 112 +++
 .../jvm/org/apache/storm/utils/UtilsTest.java   | 219 ++++++
 .../utils/WorkerBackpressureThreadTest.java     |  50 ++
 .../storm/utils/staticmocking/package-info.java |   2 +-
 156 files changed, 10128 insertions(+), 4187 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/9178b1c8/storm-core/src/clj/org/apache/storm/daemon/drpc.clj
----------------------------------------------------------------------


Mime
View raw message