You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2018/09/21 16:30:43 UTC
[4/8] storm git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/storm
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9f72f8b4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9f72f8b4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9f72f8b4
Branch: refs/heads/master
Commit: 9f72f8b47869a312941ffe6331ac2b6f2ee5aeff
Parents: 5c3a911 4f5fdd9
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Apr 11 13:57:54 2018 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Apr 11 13:57:54 2018 -0400
----------------------------------------------------------------------
.gitattributes | 11 +-
README.markdown | 3 +-
bin/flight.bash | 6 +-
conf/defaults.yaml | 117 +-
docs/Concepts.md | 5 +
docs/Distributed-RPC.md | 22 +-
docs/Local-mode.md | 2 +-
docs/Metrics.md | 4 +-
docs/Performance.md | 165 +
docs/SECURITY.md | 27 +-
docs/storm-eventhubs.md | 80 +-
docs/storm-metricstore.md | 3 +
examples/storm-elasticsearch-examples/pom.xml | 2 +-
.../elasticsearch/bolt/EsIndexTopology.java | 121 +-
.../storm/elasticsearch/bolt/package-info.java | 20 +
.../storm/elasticsearch/common/EsConstants.java | 22 +-
.../storm/elasticsearch/common/EsTestUtil.java | 71 +-
.../elasticsearch/common/package-info.java | 20 +
.../trident/TridentEsTopology.java | 137 +-
.../elasticsearch/trident/package-info.java | 20 +
.../storm/hbase/topology/TotalWordCounter.java | 1 -
.../storm/hbase/topology/WordCounter.java | 1 -
.../apache/storm/hbase/topology/WordSpout.java | 1 -
.../storm/hdfs/spout/HdfsSpoutTopology.java | 2 +-
.../storm/hive/trident/TridentHiveTopology.java | 2 +-
.../org/apache/storm/jdbc/spout/UserSpout.java | 1 -
.../jdbc/topology/AbstractUserTopology.java | 2 +-
.../apache/storm/jms/example/GenericBolt.java | 1 -
examples/storm-kafka-client-examples/pom.xml | 6 -
.../org/apache/storm/loadgen/CaptureLoad.java | 4 +-
.../loadgen/HttpForwardingMetricsServer.java | 2 +-
.../apache/storm/loadgen/LoadMetricsServer.java | 2 +-
.../storm/loadgen/ThroughputVsLatency.java | 5 +-
.../mongodb/topology/TotalWordCounter.java | 1 -
.../storm/mongodb/topology/WordSpout.java | 1 -
examples/storm-mqtt-examples/pom.xml | 2 +-
.../mqtt/examples/CustomMessageMapper.java | 50 +-
.../mqtt/examples/MqttBrokerPublisher.java | 65 +-
.../storm/mqtt/examples/package-info.java | 20 +
examples/storm-perf/README.markdown | 5 +-
examples/storm-perf/pom.xml | 45 +-
.../src/main/conf/KafkaClientHdfsTopo.yaml | 26 +
.../storm-perf/src/main/conf/KafkaHdfsTopo.yaml | 26 -
.../src/main/conf/KafkaSpoutNullBoltTopo.yaml | 23 -
.../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 +
.../apache/storm/perf/KafkaClientHdfsTopo.java | 172 +
.../org/apache/storm/perf/KafkaHdfsTopo.java | 169 -
.../storm/perf/KafkaSpoutNullBoltTopo.java | 115 -
.../apache/storm/perf/LowThroughputTopo.java | 157 +
.../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 | 113 +
.../storm/perf/utils/BasicMetricsCollector.java | 81 +-
.../org/apache/storm/perf/utils/Helper.java | 6 +-
.../apache/storm/perf/utils/IdentityBolt.java | 6 +-
.../apache/storm/perf/utils/MetricsSample.java | 61 +-
.../storm/redis/topology/WordCounter.java | 1 -
.../apache/storm/redis/topology/WordSpout.java | 1 -
examples/storm-starter/README.markdown | 14 +-
.../apache/storm/starter/AnchoredWordCount.java | 139 +
.../storm/starter/FastWordCountTopology.java | 2 +-
.../storm/starter/InOrderDeliveryTest.java | 2 +-
.../starter/ResourceAwareExampleTopology.java | 2 +-
.../storm/starter/bolt/RollingCountAggBolt.java | 1 -
.../storm/starter/bolt/RollingCountBolt.java | 1 -
external/storm-autocreds/pom.xml | 16 +
.../storm/common/AbstractHadoopAutoCreds.java | 4 +-
.../AbstractHadoopNimbusPluginAutoCreds.java | 12 +-
.../apache/storm/hbase/security/AutoHBase.java | 2 +-
.../storm/hbase/security/AutoHBaseCommand.java | 2 +-
.../storm/hbase/security/AutoHBaseNimbus.java | 12 +-
.../apache/storm/hdfs/security/AutoHDFS.java | 2 +-
.../storm/hdfs/security/AutoHDFSCommand.java | 2 +-
.../storm/hdfs/security/AutoHDFSNimbus.java | 15 +-
.../storm/hdfs/security/HdfsSecurityUtil.java | 2 +-
.../apache/storm/hive/security/AutoHive.java | 2 +-
.../storm/hive/security/AutoHiveCommand.java | 2 +-
.../storm/hive/security/AutoHiveNimbus.java | 14 +-
.../impl/ObjectMapperCqlStatementMapper.java | 2 +-
.../trident/state/CassandraMapStateFactory.java | 10 +-
.../trident/state/MapStateFactoryBuilder.java | 10 +-
.../apache/storm/cassandra/WeatherSpout.java | 2 +-
.../elasticsearch/bolt/AbstractEsBolt.java | 2 +-
.../storm/elasticsearch/bolt/EsIndexBolt.java | 2 +-
.../elasticsearch/bolt/EsPercolateBolt.java | 2 +-
.../storm/elasticsearch/common/EsTestUtil.java | 2 +-
external/storm-eventhubs/README.md | 90 +-
external/storm-eventhubs/pom.xml | 164 +-
.../eventhubs/bolt/DefaultEventDataFormat.java | 94 +-
.../storm/eventhubs/bolt/EventHubBolt.java | 292 +-
.../eventhubs/bolt/EventHubBoltConfig.java | 222 +-
.../storm/eventhubs/bolt/IEventDataFormat.java | 56 +-
.../eventhubs/spout/BinaryEventDataScheme.java | 4 +-
.../storm/eventhubs/spout/EventDataScheme.java | 156 +-
.../eventhubs/spout/EventHubReceiverImpl.java | 4 +-
.../storm/eventhubs/spout/EventHubSpout.java | 2 +-
.../storm/eventhubs/spout/FieldConstants.java | 56 +-
.../storm/eventhubs/spout/IEventDataScheme.java | 88 +-
.../eventhubs/spout/IEventHubReceiver.java | 2 +-
.../spout/IEventHubReceiverFactory.java | 60 +-
.../eventhubs/spout/IPartitionCoordinator.java | 54 +-
.../eventhubs/spout/IPartitionManager.java | 74 +-
.../storm/eventhubs/spout/IStateStore.java | 62 +-
.../apache/storm/eventhubs/spout/MessageId.java | 112 +-
.../eventhubs/spout/SimplePartitionManager.java | 2 +-
.../eventhubs/spout/ZookeeperStateStore.java | 190 +-
.../storm/eventhubs/trident/Coordinator.java | 120 +-
.../trident/ITridentPartitionManager.java | 70 +-
.../ITridentPartitionManagerFactory.java | 52 +-
.../trident/OpaqueTridentEventHubEmitter.java | 136 +-
.../trident/OpaqueTridentEventHubSpout.java | 128 +-
.../storm/eventhubs/trident/Partition.java | 78 +-
.../storm/eventhubs/trident/Partitions.java | 82 +-
.../TransactionalTridentEventHubEmitter.java | 10 +-
.../TransactionalTridentEventHubSpout.java | 132 +-
.../storm/eventhubs/samples/EventHubLoop.java | 104 +-
.../samples/OpaqueTridentEventCount.java | 106 +-
.../samples/TransactionalTridentEventCount.java | 162 +-
.../eventhubs/samples/bolt/GlobalCountBolt.java | 176 +-
.../samples/bolt/PartialCountBolt.java | 136 +-
.../eventhubs/spout/EventHubReceiverMock.java | 2 +-
.../spout/SpoutOutputCollectorMock.java | 137 +-
.../storm/eventhubs/spout/StateStoreMock.java | 108 +-
.../storm/eventhubs/spout/TestEventData.java | 94 +-
.../TestTransactionalTridentEmitter.java | 6 +-
.../eventhubs/trident/TridentCollectorMock.java | 109 +-
.../org/apache/storm/hbase/bolt/HBaseBolt.java | 2 +-
.../storm/hbase/bolt/HBaseLookupBolt.java | 1 -
.../hbase/state/HBaseKeyValueStateProvider.java | 4 +-
.../hbase/trident/state/HBaseMapState.java | 2 +-
.../storm/hbase/trident/state/HBaseState.java | 4 +-
.../hbase/trident/state/HBaseStateFactory.java | 2 +-
.../storm/hdfs/bolt/AbstractHdfsBolt.java | 18 +-
.../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 | 23 +-
.../apache/storm/hive/bolt/TestHiveBolt.java | 2 +-
.../storm/hive/common/TestHiveWriter.java | 2 +-
.../storm/jdbc/bolt/AbstractJdbcBolt.java | 2 +-
.../apache/storm/jdbc/bolt/JdbcInsertBolt.java | 2 +-
.../storm/jdbc/trident/state/JdbcState.java | 2 +-
.../jdbc/trident/state/JdbcStateFactory.java | 2 +-
.../storm/jdbc/common/JdbcClientTest.java | 2 +-
.../storm/jms/trident/JmsStateFactory.java | 2 +-
.../storm/jms/trident/TridentJmsSpout.java | 6 +-
.../jms/spout/MockSpoutOutputCollector.java | 5 +
.../apache/storm/kafka/spout/KafkaSpout.java | 76 +-
.../storm/kafka/spout/KafkaSpoutConfig.java | 44 +-
.../storm/kafka/spout/KafkaSpoutMessageId.java | 28 +-
.../ManualPartitionSubscription.java | 69 -
.../spout/subscription/ManualPartitioner.java | 13 +-
.../spout/subscription/NamedTopicFilter.java | 5 +-
.../spout/subscription/PatternTopicFilter.java | 6 +-
.../RoundRobinManualPartitioner.java | 11 +-
.../kafka/spout/subscription/Subscription.java | 57 -
.../kafka/spout/subscription/TopicAssigner.java | 51 +
.../kafka/spout/subscription/TopicFilter.java | 8 +-
.../trident/KafkaTridentSpoutBatchMetadata.java | 55 +-
.../spout/trident/KafkaTridentSpoutEmitter.java | 130 +-
.../spout/trident/KafkaTridentSpoutManager.java | 116 -
.../spout/trident/KafkaTridentSpoutOpaque.java | 26 +-
.../KafkaTridentSpoutOpaqueCoordinator.java | 43 +-
.../KafkaTridentSpoutTopicPartition.java | 6 +-
...KafkaTridentSpoutTopicPartitionRegistry.java | 47 -
.../trident/KafkaTridentSpoutTransactional.java | 49 -
.../kafka/spout/KafkaSpoutAbstractTest.java | 13 +-
.../storm/kafka/spout/KafkaSpoutEmitTest.java | 7 +-
.../KafkaSpoutLogCompactionSupportTest.java | 5 +-
.../spout/KafkaSpoutMessagingGuaranteeTest.java | 21 +-
.../kafka/spout/KafkaSpoutNullTupleTest.java | 93 +
.../kafka/spout/KafkaSpoutReactivationTest.java | 3 +-
.../kafka/spout/KafkaSpoutRebalanceTest.java | 67 +-
.../kafka/spout/KafkaSpoutRetryLimitTest.java | 15 +-
.../kafka/spout/MaxUncommittedOffsetTest.java | 1 -
.../SpoutWithMockedConsumerSetupHelper.java | 25 +-
.../SingleTopicKafkaSpoutConfiguration.java | 10 +-
.../ManualPartitionSubscriptionTest.java | 79 -
.../subscription/NamedTopicFilterTest.java | 3 +-
.../subscription/PatternTopicFilterTest.java | 3 +-
.../RoundRobinManualPartitionerTest.java | 76 +
.../spout/subscription/TopicAssignerTest.java | 68 +
.../KafkaTridentSpoutBatchMetadataTest.java | 15 +-
.../trident/KafkaTridentSpoutEmitterTest.java | 214 +
.../KafkaTridentSpoutOpaqueCoordinatorTest.java | 111 +
external/storm-kafka-migration/README.md | 8 +
external/storm-kafka-migration/pom.xml | 126 +
.../conf/example-spout-migration-config.yaml | 37 +
.../example-trident-spout-migration-config.yaml | 35 +
.../kafka/migration/KafkaSpoutMigration.java | 162 +
.../migration/KafkaTridentSpoutMigration.java | 248 +
.../apache/storm/kafka/migration/MapUtil.java | 34 +
external/storm-kafka-monitor/pom.xml | 4 +
external/storm-kafka/pom.xml | 4 +
.../jvm/org/apache/storm/kafka/KafkaSpout.java | 2 +-
.../apache/storm/kafka/PartitionManager.java | 2 +-
.../jvm/org/apache/storm/kafka/SpoutConfig.java | 1 +
.../src/jvm/org/apache/storm/kafka/ZkState.java | 7 +-
.../kafka/trident/OpaqueTridentKafkaSpout.java | 15 +-
.../kafka/trident/TridentKafkaEmitter.java | 37 +-
.../storm/kafka/PartitionManagerTest.java | 4 +
.../apache/storm/kafka/ZkCoordinatorTest.java | 4 +-
.../apache/storm/kafka/bolt/KafkaBoltTest.java | 4 +-
external/storm-kinesis/pom.xml | 4 +
external/storm-mongodb/README.md | 650 +--
.../storm/mongodb/bolt/AbstractMongoBolt.java | 124 +-
.../storm/mongodb/bolt/MongoInsertBolt.java | 248 +-
.../storm/mongodb/bolt/MongoUpdateBolt.java | 186 +-
.../storm/mongodb/common/MongoDbClient.java | 218 +-
.../mongodb/common/QueryFilterCreator.java | 94 +-
.../common/SimpleQueryFilterCreator.java | 94 +-
.../mongodb/common/mapper/MongoMapper.java | 94 +-
.../common/mapper/SimpleMongoMapper.java | 110 +-
.../common/mapper/SimpleMongoUpdateMapper.java | 92 +-
.../mongodb/trident/state/MongoMapState.java | 4 +-
.../storm/mongodb/trident/state/MongoState.java | 290 +-
.../trident/state/MongoStateFactory.java | 86 +-
.../trident/state/MongoStateUpdater.java | 70 +-
.../storm/redis/bolt/AbstractRedisBolt.java | 2 +-
.../trident/state/RedisClusterMapState.java | 2 +-
.../redis/trident/state/RedisClusterState.java | 2 +-
.../redis/trident/state/RedisMapState.java | 2 +-
.../storm/redis/trident/state/RedisState.java | 2 +-
.../rocketmq/trident/state/RocketMqState.java | 2 +-
.../storm/solr/trident/SolrStateFactory.java | 2 +-
flux/README.md | 137 +-
flux/flux-core/pom.xml | 2 +-
.../java/org/apache/storm/flux/FluxBuilder.java | 27 +-
.../storm/flux/model/ConfigMethodDef.java | 2 +-
.../org/apache/storm/flux/model/ObjectDef.java | 2 +-
.../flux/test/OnlyValueRecordTranslator.java | 37 +
.../storm/flux/test/TridentTopologySource.java | 1 -
.../src/test/resources/configs/kafka_test.yaml | 61 +-
flux/flux-examples/README.md | 2 +-
flux/flux-examples/pom.xml | 6 +-
.../examples/OnlyValueRecordTranslator.java | 37 +
.../flux/examples/StatefulWordCounter.java | 1 -
.../apache/storm/flux/examples/WordCounter.java | 1 -
.../src/main/resources/kafka_spout.yaml | 71 +-
integration-test/README.md | 118 +-
integration-test/config/storm.yaml | 4 +
.../test/java/org/apache/storm/st/DemoTest.java | 1 +
.../apache/storm/st/wrapper/StormCluster.java | 2 +-
pom.xml | 54 +-
storm-client/pom.xml | 19 +-
.../src/jvm/org/apache/storm/Config.java | 466 +-
.../src/jvm/org/apache/storm/Constants.java | 2 +-
.../jvm/org/apache/storm/StormSubmitter.java | 5 +-
.../src/jvm/org/apache/storm/StormTimer.java | 62 +-
.../src/jvm/org/apache/storm/Thrift.java | 46 +-
.../assignments/ILocalAssignmentsBackend.java | 116 +
.../assignments/InMemoryAssignmentBackend.java | 158 +
.../LocalAssignmentsBackendFactory.java | 48 +
.../org/apache/storm/cluster/ClusterUtils.java | 25 +-
.../org/apache/storm/cluster/DaemonType.java | 2 +
.../storm/cluster/IStormClusterState.java | 184 +-
.../storm/cluster/PaceMakerStateStorage.java | 31 +-
.../cluster/PaceMakerStateStorageFactory.java | 2 +-
.../storm/cluster/StateStorageFactory.java | 2 +-
.../storm/cluster/StormClusterStateImpl.java | 184 +-
.../apache/storm/cluster/ZKStateStorage.java | 19 +-
.../storm/cluster/ZKStateStorageFactory.java | 9 +-
.../coordination/BatchOutputCollector.java | 9 +-
.../coordination/BatchOutputCollectorImpl.java | 5 +
.../coordination/BatchSubtopologyBuilder.java | 21 +-
.../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 | 10 +-
.../src/jvm/org/apache/storm/daemon/Task.java | 136 +-
.../daemon/metrics/BuiltinMetricsUtil.java | 32 +-
.../daemon/metrics/ClientMetricsUtils.java | 52 +
.../daemon/metrics/SpoutThrottlingMetrics.java | 13 +-
.../supervisor/ClientSupervisorUtils.java | 4 +-
.../daemon/worker/BackPressureTracker.java | 98 +
.../org/apache/storm/daemon/worker/Worker.java | 436 +-
.../apache/storm/daemon/worker/WorkerState.java | 427 +-
.../storm/daemon/worker/WorkerTransfer.java | 144 +
.../jvm/org/apache/storm/drpc/DRPCSpout.java | 4 +-
.../jvm/org/apache/storm/drpc/JoinResult.java | 2 +-
.../storm/drpc/LinearDRPCTopologyBuilder.java | 28 +-
.../org/apache/storm/drpc/PrepareRequest.java | 2 +-
.../org/apache/storm/drpc/ReturnResults.java | 6 +-
.../jvm/org/apache/storm/executor/Executor.java | 347 +-
.../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 | 174 +-
.../executor/bolt/BoltOutputCollectorImpl.java | 111 +-
.../storm/executor/spout/SpoutExecutor.java | 296 +-
.../spout/SpoutOutputCollectorImpl.java | 94 +-
.../jvm/org/apache/storm/generated/HBNodes.java | 32 +-
.../org/apache/storm/generated/HBRecords.java | 36 +-
.../jvm/org/apache/storm/generated/Nimbus.java | 5135 +++++++++++++-----
.../org/apache/storm/generated/Supervisor.java | 2968 ++++++++++
.../storm/generated/SupervisorAssignments.java | 478 ++
.../apache/storm/generated/SupervisorInfo.java | 177 +-
.../generated/SupervisorWorkerHeartbeat.java | 660 +++
.../generated/SupervisorWorkerHeartbeats.java | 561 ++
.../storm/generated/WorkerMetricList.java | 36 +-
.../storm/generated/WorkerTokenServiceType.java | 5 +-
.../grouping/LoadAwareShuffleGrouping.java | 12 +-
.../apache/storm/grouping/ShuffleGrouping.java | 9 +-
.../storm/hooks/info/BoltExecuteInfo.java | 3 +-
.../DeserializingConnectionCallback.java | 4 +-
.../org/apache/storm/messaging/IConnection.java | 31 +-
.../org/apache/storm/messaging/IContext.java | 10 +-
.../apache/storm/messaging/local/Context.java | 30 +-
.../messaging/netty/BackPressureStatus.java | 75 +
.../apache/storm/messaging/netty/Client.java | 132 +-
.../apache/storm/messaging/netty/Context.java | 8 +-
.../storm/messaging/netty/MessageDecoder.java | 43 +-
.../storm/messaging/netty/MessageEncoder.java | 18 +-
.../apache/storm/messaging/netty/Server.java | 47 +-
.../messaging/netty/StormClientHandler.java | 43 +-
.../netty/StormClientPipelineFactory.java | 11 +-
.../netty/StormServerPipelineFactory.java | 6 +-
.../jvm/org/apache/storm/metric/SystemBolt.java | 2 +-
.../storm/metric/api/MultiCountMetric.java | 4 +-
.../storm/metric/api/MultiReducedMetric.java | 4 +-
.../org/apache/storm/metrics2/JcMetrics.java | 45 +
.../org/apache/storm/metrics2/SimpleGauge.java | 38 +
.../storm/metrics2/StormMetricRegistry.java | 180 +
.../org/apache/storm/metrics2/TaskMetrics.java | 85 +
.../storm/metrics2/filters/RegexFilter.java | 48 +
.../metrics2/filters/StormMetricsFilter.java | 33 +
.../reporters/ConsoleStormReporter.java | 69 +
.../metrics2/reporters/CsvStormReporter.java | 97 +
.../reporters/GangliaStormReporter.java | 132 +
.../reporters/GraphiteStormReporter.java | 102 +
.../metrics2/reporters/JmxStormReporter.java | 92 +
.../reporters/ScheduledStormReporter.java | 86 +
.../storm/metrics2/reporters/StormReporter.java | 35 +
.../apache/storm/pacemaker/PacemakerClient.java | 72 +-
.../storm/pacemaker/PacemakerClientPool.java | 29 +-
.../org/apache/storm/policy/IWaitStrategy.java | 61 +
.../apache/storm/policy/WaitStrategyPark.java | 60 +
.../storm/policy/WaitStrategyProgressive.java | 76 +
.../storm/security/auth/FixedGroupsMapping.java | 2 +-
.../apache/storm/security/auth/IAuthorizer.java | 6 +-
.../security/auth/ThriftConnectionType.java | 29 +-
.../auth/authorizer/DRPCAuthorizerBase.java | 6 +-
.../authorizer/DRPCSimpleACLAuthorizer.java | 6 +-
.../auth/authorizer/SimpleACLAuthorizer.java | 7 +-
.../SupervisorSimpleACLAuthorizer.java | 157 +
.../auth/digest/DigestSaslTransportPlugin.java | 4 +-
.../auth/digest/JassPasswordProvider.java | 5 +
.../kerberos/KerberosSaslTransportPlugin.java | 6 +-
.../auth/kerberos/ServerCallbackHandler.java | 11 +-
.../auth/plain/PlainSaslTransportPlugin.java | 5 +-
.../security/auth/sasl/PasswordProvider.java | 8 +
.../security/auth/sasl/SaslTransportPlugin.java | 5 +-
.../sasl/SimpleSaslServerCallbackHandler.java | 30 +-
.../serialization/BlowfishTupleSerializer.java | 30 +-
.../serialization/KryoTupleDeserializer.java | 6 +-
.../serialization/KryoValuesDeserializer.java | 4 +-
.../serialization/KryoValuesSerializer.java | 5 +-
.../serialization/SerializationFactory.java | 2 +
.../serialization/types/HashMapSerializer.java | 4 +-
.../storm/spout/ISpoutOutputCollector.java | 6 +
.../apache/storm/spout/ISpoutWaitStrategy.java | 34 -
.../storm/spout/NothingEmptyEmitStrategy.java | 31 -
.../storm/spout/SleepSpoutWaitStrategy.java | 41 -
.../storm/spout/SpoutOutputCollector.java | 9 +-
.../storm/state/DefaultStateSerializer.java | 2 +-
.../apache/storm/stats/BoltExecutorStats.java | 67 +-
.../jvm/org/apache/storm/stats/CommonStats.java | 87 +-
.../apache/storm/stats/SpoutExecutorStats.java | 38 +-
.../jvm/org/apache/storm/stats/StatsUtil.java | 141 +-
.../storm/task/GeneralTopologyContext.java | 13 +-
.../org/apache/storm/task/IOutputCollector.java | 2 +
.../org/apache/storm/task/OutputCollector.java | 7 +-
.../org/apache/storm/task/TopologyContext.java | 79 +-
.../storm/testing/NonRichBoltTracker.java | 2 +-
.../org/apache/storm/testing/SpoutTracker.java | 11 +-
.../topology/BaseConfigurationDeclarer.java | 26 +
.../ComponentConfigurationDeclarer.java | 7 +
.../apache/storm/topology/TopologyBuilder.java | 35 +-
.../TransactionalTopologyBuilder.java | 51 +-
.../state/TestTransactionalState.java | 2 +-
.../transactional/state/TransactionalState.java | 8 +-
.../apache/storm/trident/TridentTopology.java | 12 +-
.../trident/drpc/ReturnResultsReducer.java | 4 +-
.../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 +
.../spout/IOpaquePartitionedTridentSpout.java | 21 +-
.../OpaquePartitionedTridentSpoutExecutor.java | 10 +-
.../trident/spout/RichSpoutBatchExecutor.java | 7 +-
.../trident/spout/RichSpoutBatchTriggerer.java | 5 +
.../trident/spout/TridentSpoutExecutor.java | 5 +
.../trident/topology/TridentBoltExecutor.java | 9 +-
.../topology/TridentTopologyBuilder.java | 48 +-
.../topology/state/TransactionalState.java | 8 +-
.../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 | 15 +-
.../utils/DisruptorBackpressureCallback.java | 27 -
.../org/apache/storm/utils/DisruptorQueue.java | 619 ---
.../src/jvm/org/apache/storm/utils/JCQueue.java | 480 ++
.../jvm/org/apache/storm/utils/MutableLong.java | 2 +-
.../org/apache/storm/utils/NimbusClient.java | 2 +-
.../org/apache/storm/utils/ObjectReader.java | 4 +
.../jvm/org/apache/storm/utils/RotatingMap.java | 2 +-
.../org/apache/storm/utils/SimpleVersion.java | 2 +-
.../apache/storm/utils/SupervisorClient.java | 88 +
.../src/jvm/org/apache/storm/utils/Time.java | 8 +-
.../org/apache/storm/utils/TransferDrainer.java | 199 +-
.../jvm/org/apache/storm/utils/TupleUtils.java | 2 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 217 +-
.../storm/utils/WorkerBackpressureCallback.java | 26 -
.../storm/utils/WorkerBackpressureThread.java | 80 -
.../storm/validation/ConfigValidation.java | 200 +-
.../validation/ConfigValidationAnnotations.java | 9 +
.../apache/storm/zookeeper/ClientZookeeper.java | 8 +-
storm-client/src/py/storm/Nimbus-remote | 21 +
storm-client/src/py/storm/Nimbus.py | 633 ++-
storm-client/src/py/storm/Supervisor-remote | 126 +
storm-client/src/py/storm/Supervisor.py | 694 +++
storm-client/src/py/storm/__init__.py | 2 +-
storm-client/src/py/storm/ttypes.py | 369 +-
storm-client/src/storm.thrift | 46 +-
.../org/apache/storm/TestConfigValidate.java | 19 +-
.../LocalAssignmentsBackendTest.java | 102 +
.../jvm/org/apache/storm/bolt/TestJoinBolt.java | 51 +-
.../cluster/StormClusterStateImplTest.java | 48 +-
.../grouping/LoadAwareShuffleGroupingTest.java | 4 +-
.../DeserializingConnectionCallbackTest.java | 4 +-
.../apache/storm/security/auth/AutoSSLTest.java | 10 +-
.../BlowfishTupleSerializerTest.java | 45 +-
.../apache/storm/streams/ProcessorBoltTest.java | 3 +-
.../topology/WindowedBoltExecutorTest.java | 16 +-
.../storm/trident/TestTridentTopology.java | 152 +-
.../utils/DisruptorQueueBackpressureTest.java | 110 -
.../apache/storm/utils/DisruptorQueueTest.java | 187 -
.../storm/utils/JCQueueBackpressureTest.java | 95 +
.../jvm/org/apache/storm/utils/JCQueueTest.java | 209 +
.../apache/storm/utils/SimpleVersionTest.java | 69 +
.../jvm/org/apache/storm/utils/UtilsTest.java | 62 +-
.../utils/WorkerBackpressureThreadTest.java | 50 -
.../storm/clojure/IndifferentAccessMap.java | 17 +-
storm-core/pom.xml | 4 +
.../apache/storm/command/shell_submission.clj | 2 +-
.../apache/storm/command/UploadCredentials.java | 9 +-
.../apache/storm/ui/FilterConfiguration.java | 10 +-
.../src/jvm/org/apache/storm/ui/UIHelpers.java | 6 +-
.../org/apache/storm/integration_test.clj | 12 +-
.../apache/storm/messaging/netty_unit_test.clj | 42 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 70 +-
.../storm/security/auth/nimbus_auth_test.clj | 4 +
.../nimbus/InMemoryTopologyActionNotifier.java | 2 +-
.../storm/serialization/SerializationTest.java | 12 +-
.../org/apache/storm/stats/TestStatsUtil.java | 10 +-
storm-server/pom.xml | 4 +
.../java/org/apache/storm/DaemonConfig.java | 75 +-
.../java/org/apache/storm/LocalCluster.java | 19 +
.../src/main/java/org/apache/storm/Testing.java | 9 +-
.../storm/daemon/metrics/MetricsUtils.java | 39 +-
.../reporters/ConsolePreparableReporter.java | 16 +-
.../reporters/CsvPreparableReporter.java | 17 +-
.../reporters/JmxPreparableReporter.java | 12 +-
.../org/apache/storm/daemon/nimbus/Nimbus.java | 534 +-
.../storm/daemon/supervisor/BasicContainer.java | 112 +-
.../supervisor/BasicContainerLauncher.java | 13 +-
.../storm/daemon/supervisor/Container.java | 15 +-
.../daemon/supervisor/ContainerLauncher.java | 10 +-
.../storm/daemon/supervisor/LocalContainer.java | 7 +-
.../supervisor/LocalContainerLauncher.java | 7 +-
.../daemon/supervisor/ReadClusterState.java | 69 +-
.../daemon/supervisor/RunAsUserContainer.java | 19 +-
.../supervisor/RunAsUserContainerLauncher.java | 15 +-
.../apache/storm/daemon/supervisor/Slot.java | 13 +-
.../storm/daemon/supervisor/Supervisor.java | 226 +-
.../daemon/supervisor/SupervisorUtils.java | 17 +-
.../timer/ReportWorkerHeartbeats.java | 112 +
.../supervisor/timer/SupervisorHealthCheck.java | 6 +
.../supervisor/timer/SupervisorHeartbeat.java | 17 +-
.../timer/SynchronizeAssignments.java | 133 +
.../apache/storm/healthcheck/HealthChecker.java | 10 +-
.../apache/storm/localizer/AsyncLocalizer.java | 139 +-
.../storm/localizer/LocalizedResource.java | 5 +
.../storm/localizer/LocallyCachedBlob.java | 5 +-
.../apache/storm/metricstore/MetricStore.java | 2 +-
.../storm/metricstore/MetricStoreConfig.java | 26 +-
.../metricstore/NimbusMetricProcessor.java | 41 +
.../metricstore/WorkerMetricsProcessor.java | 40 +
.../storm/metricstore/rocksdb/RocksDbStore.java | 6 +-
.../nimbus/AssignmentDistributionService.java | 312 ++
.../storm/nimbus/DefaultTopologyValidator.java | 42 +-
.../org/apache/storm/nimbus/ILeaderElector.java | 6 +-
.../nimbus/ITopologyActionNotifierPlugin.java | 2 +-
.../apache/storm/nimbus/ITopologyValidator.java | 4 +-
.../IWorkerHeartbeatsRecoveryStrategy.java | 48 +
.../storm/nimbus/LeaderListenerCallback.java | 231 +
.../nimbus/NimbusHeartbeatsPressureTest.java | 241 +
.../storm/nimbus/StrictTopologyValidator.java | 67 +
...TimeOutWorkerHeartbeatsRecoveryStrategy.java | 80 +
...WorkerHeartbeatsRecoveryStrategyFactory.java | 53 +
.../storm/scheduler/DefaultScheduler.java | 2 +-
.../apache/storm/scheduler/EvenScheduler.java | 2 +-
.../org/apache/storm/scheduler/IScheduler.java | 2 +-
.../storm/scheduler/IsolationScheduler.java | 2 +-
.../storm/scheduler/SupervisorDetails.java | 27 +-
.../scheduler/blacklist/BlacklistScheduler.java | 8 +-
.../apache/storm/scheduler/blacklist/Sets.java | 106 -
.../strategies/DefaultBlacklistStrategy.java | 2 +-
.../strategies/IBlacklistStrategy.java | 2 +-
.../multitenant/MultitenantScheduler.java | 7 +-
.../resource/ResourceAwareScheduler.java | 4 +-
.../scheduling/BaseResourceAwareStrategy.java | 14 +-
.../utils/ArtifactoryConfigLoader.java | 22 +-
.../storm/scheduler/utils/FileConfigLoader.java | 6 +-
.../org/apache/storm/utils/ServerUtils.java | 2 +-
.../storm/zookeeper/LeaderElectorImp.java | 12 +-
.../org/apache/storm/zookeeper/Zookeeper.java | 145 +-
.../java/org/apache/storm/TickTupleTest.java | 3 +-
.../daemon/supervisor/BasicContainerTest.java | 244 +-
.../storm/daemon/supervisor/ContainerTest.java | 16 +-
.../storm/daemon/supervisor/SlotTest.java | 14 +-
.../storm/localizer/AsyncLocalizerTest.java | 5 +-
.../scheduler/blacklist/FaultGenerateUtils.java | 2 +-
.../TestUtilsForBlacklistScheduler.java | 16 +-
.../utils/ArtifactoryConfigLoaderTest.java | 20 +-
.../scheduler/utils/FileConfigLoaderTest.java | 10 +-
storm-webapp/pom.xml | 24 +-
.../storm/daemon/logviewer/LogviewerServer.java | 7 +-
.../logviewer/utils/DirectoryCleaner.java | 2 +-
.../logviewer/webapp/LogviewerResource.java | 4 +-
560 files changed, 28241 insertions(+), 10668 deletions(-)
----------------------------------------------------------------------