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 2018/02/14 14:07:44 UTC
[9/9] storm git commit: Merge branch 'STORM-2306-2' of
https://github.com/roshannaik/storm into STORM-2306
Merge branch 'STORM-2306-2' of https://github.com/roshannaik/storm into STORM-2306
STORM-2306: Messaging subsystem redesign
This closes #2502
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/09e01231
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/09e01231
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/09e01231
Branch: refs/heads/master
Commit: 09e01231cc427004bab475c9c70f21fa79cfedef
Parents: ab7b4ca bc4c480
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Wed Feb 14 07:48:31 2018 -0600
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Wed Feb 14 07:48:31 2018 -0600
----------------------------------------------------------------------
conf/defaults.yaml | 62 +-
docs/Concepts.md | 5 +
docs/Local-mode.md | 2 +-
docs/Metrics.md | 4 +-
docs/Performance.md | 164 +++++
.../storm/elasticsearch/common/EsTestUtil.java | 2 +-
examples/storm-perf/pom.xml | 2 +-
.../org/apache/storm/perf/BackPressureTopo.java | 115 ++++
.../perf/ConstSpoutIdBoltNullBoltTopo.java | 38 +-
.../storm/perf/ConstSpoutNullBoltTopo.java | 32 +-
.../apache/storm/perf/ConstSpoutOnlyTopo.java | 6 +-
.../storm/perf/FileReadWordCountTopo.java | 23 +-
.../storm/perf/HdfsSpoutNullBoltTopo.java | 46 +-
.../org/apache/storm/perf/JCQueuePerfTest.java | 380 ++++++++++++
.../org/apache/storm/perf/JCToolsPerfTest.java | 227 +++++++
.../org/apache/storm/perf/KafkaHdfsTopo.java | 124 ++--
.../storm/perf/KafkaSpoutNullBoltTopo.java | 23 +-
.../apache/storm/perf/LowThroughputTopo.java | 154 +++++
.../storm/perf/SimplifiedWordCountTopo.java | 85 +++
.../storm/perf/StrGenSpoutHdfsBoltTopo.java | 37 +-
.../org/apache/storm/perf/ThroughputMeter.java | 72 +++
.../org/apache/storm/perf/bolt/CountBolt.java | 7 +-
.../org/apache/storm/perf/bolt/DevNullBolt.java | 15 +-
.../java/org/apache/storm/perf/bolt/IdBolt.java | 6 +-
.../storm/perf/bolt/SplitSentenceBolt.java | 19 +-
.../org/apache/storm/perf/spout/ConstSpout.java | 23 +-
.../apache/storm/perf/spout/FileReadSpout.java | 54 +-
.../apache/storm/perf/spout/StringGenSpout.java | 17 +-
.../apache/storm/perf/spout/WordGenSpout.java | 108 ++++
.../storm/perf/utils/BasicMetricsCollector.java | 81 ++-
.../org/apache/storm/perf/utils/Helper.java | 4 +-
.../apache/storm/perf/utils/IdentityBolt.java | 6 +-
.../apache/storm/perf/utils/MetricsSample.java | 61 +-
.../storm/elasticsearch/common/EsTestUtil.java | 2 +-
.../spout/SpoutOutputCollectorMock.java | 5 +
.../eventhubs/trident/TridentCollectorMock.java | 5 +
.../hdfs/bolt/AvroGenericRecordBoltTest.java | 2 +-
.../apache/storm/hdfs/bolt/TestHdfsBolt.java | 2 +-
.../storm/hdfs/bolt/TestSequenceFileBolt.java | 2 +-
.../bolt/format/TestSimpleFileNameFormat.java | 13 +-
.../apache/storm/hdfs/spout/TestHdfsSpout.java | 21 +-
.../apache/storm/hive/bolt/TestHiveBolt.java | 2 +-
.../storm/hive/common/TestHiveWriter.java | 2 +-
.../jms/spout/MockSpoutOutputCollector.java | 5 +
.../apache/storm/kafka/spout/KafkaSpout.java | 2 +-
.../storm/kafka/PartitionManagerTest.java | 4 +
.../apache/storm/kafka/bolt/KafkaBoltTest.java | 4 +-
pom.xml | 8 +-
storm-client/pom.xml | 6 +-
.../src/jvm/org/apache/storm/Config.java | 230 ++++---
.../src/jvm/org/apache/storm/Constants.java | 2 +-
.../src/jvm/org/apache/storm/StormTimer.java | 42 +-
.../org/apache/storm/cluster/ClusterUtils.java | 2 +-
.../storm/cluster/IStormClusterState.java | 108 ++--
.../storm/cluster/StormClusterStateImpl.java | 62 +-
.../coordination/BatchOutputCollector.java | 9 +-
.../coordination/BatchOutputCollectorImpl.java | 5 +
.../storm/coordination/CoordinatedBolt.java | 8 +-
.../src/jvm/org/apache/storm/daemon/Acker.java | 9 +-
.../org/apache/storm/daemon/GrouperFactory.java | 11 +-
.../org/apache/storm/daemon/StormCommon.java | 8 +-
.../src/jvm/org/apache/storm/daemon/Task.java | 122 +++-
.../daemon/metrics/BuiltinMetricsUtil.java | 13 -
.../daemon/metrics/SpoutThrottlingMetrics.java | 13 +-
.../supervisor/ClientSupervisorUtils.java | 4 +-
.../daemon/worker/BackPressureTracker.java | 96 +++
.../org/apache/storm/daemon/worker/Worker.java | 386 +++++-------
.../apache/storm/daemon/worker/WorkerState.java | 337 +++++-----
.../storm/daemon/worker/WorkerTransfer.java | 143 +++++
.../jvm/org/apache/storm/executor/Executor.java | 326 +++++-----
.../apache/storm/executor/ExecutorShutdown.java | 51 +-
.../apache/storm/executor/ExecutorTransfer.java | 98 ++-
.../apache/storm/executor/IRunningExecutor.java | 13 +-
.../apache/storm/executor/LocalExecutor.java | 10 +-
.../org/apache/storm/executor/TupleInfo.java | 8 +
.../storm/executor/bolt/BoltExecutor.java | 171 +++--
.../executor/bolt/BoltOutputCollectorImpl.java | 110 ++--
.../storm/executor/spout/SpoutExecutor.java | 272 +++++---
.../spout/SpoutOutputCollectorImpl.java | 94 ++-
.../apache/storm/grouping/ShuffleGrouping.java | 9 +-
.../storm/hooks/info/BoltExecuteInfo.java | 3 +-
.../org/apache/storm/messaging/IConnection.java | 31 +-
.../org/apache/storm/messaging/IContext.java | 10 +-
.../apache/storm/messaging/local/Context.java | 28 +-
.../messaging/netty/BackPressureStatus.java | 75 +++
.../apache/storm/messaging/netty/Client.java | 129 ++--
.../apache/storm/messaging/netty/Context.java | 6 +-
.../storm/messaging/netty/MessageDecoder.java | 43 +-
.../storm/messaging/netty/MessageEncoder.java | 18 +-
.../apache/storm/messaging/netty/Server.java | 45 +-
.../messaging/netty/StormClientHandler.java | 43 +-
.../netty/StormClientPipelineFactory.java | 11 +-
.../netty/StormServerPipelineFactory.java | 6 +-
.../org/apache/storm/policy/IWaitStrategy.java | 61 ++
.../apache/storm/policy/WaitStrategyPark.java | 58 ++
.../storm/policy/WaitStrategyProgressive.java | 72 +++
.../serialization/KryoTupleDeserializer.java | 6 +-
.../serialization/KryoValuesDeserializer.java | 4 +-
.../serialization/KryoValuesSerializer.java | 5 +-
.../serialization/SerializationFactory.java | 2 +
.../storm/spout/ISpoutOutputCollector.java | 6 +
.../storm/spout/SpoutOutputCollector.java | 9 +-
.../storm/state/DefaultStateSerializer.java | 2 +-
.../apache/storm/stats/BoltExecutorStats.java | 55 +-
.../jvm/org/apache/storm/stats/CommonStats.java | 64 +-
.../apache/storm/stats/SpoutExecutorStats.java | 32 +-
.../storm/task/GeneralTopologyContext.java | 11 +-
.../org/apache/storm/task/IOutputCollector.java | 2 +
.../org/apache/storm/task/OutputCollector.java | 7 +-
.../org/apache/storm/task/TopologyContext.java | 5 +-
.../org/apache/storm/testing/SpoutTracker.java | 5 +
.../trident/operation/TridentCollector.java | 5 +
.../operation/impl/CaptureCollector.java | 5 +
.../trident/operation/impl/GroupCollector.java | 5 +
.../storm/trident/planner/BridgeReceiver.java | 6 +-
.../storm/trident/planner/TupleReceiver.java | 2 +-
.../planner/processor/AggregateProcessor.java | 7 +-
.../planner/processor/AppendCollector.java | 7 +
.../planner/processor/EachProcessor.java | 6 +
.../planner/processor/FreshCollector.java | 7 +
.../trident/planner/processor/MapProcessor.java | 6 +
.../processor/MultiReducerProcessor.java | 6 +-
.../processor/PartitionPersistProcessor.java | 5 +
.../planner/processor/ProjectedProcessor.java | 7 +
.../planner/processor/StateQueryProcessor.java | 5 +
.../trident/spout/RichSpoutBatchExecutor.java | 7 +-
.../trident/spout/RichSpoutBatchTriggerer.java | 5 +
.../trident/spout/TridentSpoutExecutor.java | 5 +
.../trident/topology/TridentBoltExecutor.java | 9 +-
.../windowing/AbstractTridentWindowManager.java | 5 +
.../windowing/WindowTridentProcessor.java | 5 +
.../org/apache/storm/tuple/AddressedTuple.java | 11 +-
.../jvm/org/apache/storm/tuple/MessageId.java | 7 +-
.../jvm/org/apache/storm/tuple/TupleImpl.java | 55 +-
.../jvm/org/apache/storm/utils/ConfigUtils.java | 11 +-
.../utils/DisruptorBackpressureCallback.java | 27 -
.../org/apache/storm/utils/DisruptorQueue.java | 619 -------------------
.../src/jvm/org/apache/storm/utils/JCQueue.java | 455 ++++++++++++++
.../jvm/org/apache/storm/utils/MutableLong.java | 2 +-
.../org/apache/storm/utils/ObjectReader.java | 4 +
.../jvm/org/apache/storm/utils/RotatingMap.java | 2 +-
.../src/jvm/org/apache/storm/utils/Time.java | 8 +-
.../org/apache/storm/utils/TransferDrainer.java | 199 +++---
.../src/jvm/org/apache/storm/utils/Utils.java | 38 +-
.../storm/utils/WorkerBackpressureCallback.java | 26 -
.../storm/utils/WorkerBackpressureThread.java | 80 ---
.../storm/validation/ConfigValidation.java | 33 +
.../validation/ConfigValidationAnnotations.java | 9 +
.../jvm/org/apache/storm/bolt/TestJoinBolt.java | 51 +-
.../cluster/StormClusterStateImplTest.java | 43 +-
.../topology/WindowedBoltExecutorTest.java | 16 +-
.../utils/DisruptorQueueBackpressureTest.java | 110 ----
.../apache/storm/utils/DisruptorQueueTest.java | 187 ------
.../storm/utils/JCQueueBackpressureTest.java | 95 +++
.../jvm/org/apache/storm/utils/JCQueueTest.java | 209 +++++++
.../utils/WorkerBackpressureThreadTest.java | 50 --
.../storm/clojure/IndifferentAccessMap.java | 17 +-
.../org/apache/storm/integration_test.clj | 12 +-
.../apache/storm/messaging/netty_unit_test.clj | 42 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 13 +-
.../src/main/java/org/apache/storm/Testing.java | 8 +-
.../org/apache/storm/daemon/nimbus/Nimbus.java | 2 +-
.../storm/daemon/supervisor/BasicContainer.java | 72 +--
163 files changed, 5334 insertions(+), 3009 deletions(-)
----------------------------------------------------------------------