Merge branch '1.x-branch' into metrics_v2
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c4404cab Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c4404cab Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c4404cab Branch: refs/heads/1.x-branch Commit: c4404cab69966fbf98c4f1e6d4bc41945e51cfcb Parents: 427076e 25fa9dd Author: P. Taylor Goetz <[email protected]> Authored: Mon Jan 22 11:36:12 2018 -0500 Committer: P. Taylor Goetz <[email protected]> Committed: Mon Jan 22 11:36:12 2018 -0500 ---------------------------------------------------------------------- .travis.yml | 10 +- DEVELOPER.md | 10 +- docs/Contributing-to-Storm.md | 2 +- examples/storm-solr-examples/pom.xml | 21 + examples/storm-starter/README.markdown | 4 +- .../multilang/resources/randomsentence.js | 8 + .../main/java/org/apache/storm/flux/Flux.java | 12 +- .../apache/storm/flux/parser/FluxParser.java | 73 ++-- .../java/org/apache/storm/flux/TCKTest.java | 4 +- .../multilang/MultilangEnvironmentTest.java | 89 ++++ .../multilang/MultilangEnvirontmentTest.java | 89 ---- .../resources/configs/substitution-test.yaml | 6 +- .../main/resources/resources/randomsentence.js | 8 + .../apache/storm/common/AbstractAutoCreds.java | 16 +- external/storm-druid/pom.xml | 17 + external/storm-hdfs/pom.xml | 8 + external/storm-hive/README.md | 4 +- external/storm-hive/pom.xml | 8 + external/storm-kafka-client/pom.xml | 16 + .../apache/storm/kafka/spout/KafkaSpout.java | 245 ++++++++--- .../storm/kafka/spout/KafkaSpoutConfig.java | 54 ++- .../storm/kafka/spout/KafkaSpoutMessageId.java | 26 +- .../spout/ManualPartitionSubscription.java | 7 +- .../kafka/spout/internal/CommitMetadata.java | 63 +++ .../kafka/spout/internal/OffsetManager.java | 89 ++-- .../kafka/spout/metrics/KafkaOffsetMetric.java | 141 +++++++ .../storm/kafka/trident/TridentKafkaState.java | 70 ++-- .../kafka/trident/TridentKafkaStateFactory.java | 17 +- .../kafka/trident/TridentKafkaStateUpdater.java | 6 +- .../kafka/spout/KafkaSpoutAbstractTest.java | 179 ++++++++ .../storm/kafka/spout/KafkaSpoutConfigTest.java | 10 + .../storm/kafka/spout/KafkaSpoutEmitTest.java | 10 +- .../KafkaSpoutLogCompactionSupportTest.java | 2 +- .../spout/KafkaSpoutMessagingGuaranteeTest.java | 14 +- .../kafka/spout/KafkaSpoutReactivationTest.java | 145 +++++++ .../kafka/spout/KafkaSpoutRebalanceTest.java | 5 +- .../kafka/spout/KafkaSpoutRetryLimitTest.java | 5 +- .../kafka/spout/KafkaSpoutSingleTopicTest.java | 379 +++++++++++++++++ ...outTopologyDeployActivateDeactivateTest.java | 116 ++++++ .../kafka/spout/MaxUncommittedOffsetTest.java | 7 +- .../kafka/spout/SingleTopicKafkaSpoutTest.java | 410 ------------------- .../spout/SingleTopicKafkaUnitSetupHelper.java | 24 +- .../SpoutWithMockedConsumerSetupHelper.java | 66 ++- .../kafka/spout/internal/OffsetManagerTest.java | 35 +- .../ManualPartitionSubscriptionTest.java | 2 + .../org/apache/storm/kafka/KafkaUtilsTest.java | 2 +- external/storm-mqtt/pom.xml | 2 - external/storm-solr/README.md | 26 +- external/storm-solr/pom.xml | 27 +- .../apache/storm/solr/bolt/SolrUpdateBolt.java | 28 +- .../apache/storm/solr/config/SolrConfig.java | 14 + .../storm/solr/mapper/SolrJsonMapper.java | 1 + .../schema/builder/RestJsonSchemaBuilder.java | 1 + .../apache/storm/solr/trident/SolrState.java | 4 + integration-test/pom.xml | 2 + pom.xml | 4 +- storm-core/pom.xml | 79 ++-- storm-core/src/dev/resources/tester_spout.js | 8 + storm-core/src/jvm/org/apache/storm/Config.java | 8 + .../daemon/supervisor/ReadClusterState.java | 1 + .../apache/storm/daemon/supervisor/Slot.java | 13 +- .../storm/daemon/supervisor/Supervisor.java | 2 +- .../storm/metric/FileBasedEventLogger.java | 34 +- .../jvm/org/apache/storm/spout/ShellSpout.java | 37 +- .../jvm/org/apache/storm/task/ShellBolt.java | 38 +- .../storm/utils/DefaultShellLogHandler.java | 113 +++++ .../org/apache/storm/utils/ShellLogHandler.java | 52 +++ .../jvm/org/apache/storm/utils/ShellUtils.java | 17 + .../storm/utils/WorkerBackpressureThread.java | 20 +- .../src/resources/compile-worker-launcher.sh | 21 + .../storm/utils/DefaultShellLogHandlerTest.java | 105 +++++ .../org/apache/storm/utils/ShellUtilsTest.java | 103 +++++ .../utils/WorkerBackpressureThreadTest.java | 23 +- .../src/main/resources/resources/storm.js | 20 + .../src/main/resources/resources/storm.py | 10 + .../ruby/src/main/resources/resources/storm.rb | 8 + 76 files changed, 2408 insertions(+), 947 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/c4404cab/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/c4404cab/storm-core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/c4404cab/storm-core/src/jvm/org/apache/storm/Config.java ----------------------------------------------------------------------
