You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/12/01 19:09:34 UTC
[50/50] [abbrv] storm git commit: Merge branch 'STORM-1040' of
https://github.com/haohui/storm into STORM-1040
Merge branch 'STORM-1040' of https://github.com/haohui/storm into STORM-1040
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0f18238f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0f18238f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0f18238f
Branch: refs/heads/STORM-1040
Commit: 0f18238f55925343a52e9d772639471f1369775e
Parents: 9f214ab 31b4959
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Tue Dec 1 10:07:48 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Tue Dec 1 10:07:48 2015 -0800
----------------------------------------------------------------------
.gitignore | 3 +
.travis.yml | 17 +-
CHANGELOG.md | 115 +-
DEVELOPER.md | 35 +-
DISCLAIMER | 10 -
LICENSE | 41 +
README.markdown | 11 +
STORM-UI-REST-API.md | 707 -
bin/flight.bash | 154 +
bin/storm | 22 +-
bin/storm-config.cmd | 10 +-
bin/storm.py | 115 +-
conf/defaults.yaml | 45 +-
conf/storm.yaml.example | 2 +-
dev-tools/storm-merge.py | 2 +-
dev-tools/travis/ratprint.py | 26 +
dev-tools/travis/travis-install.sh | 9 +-
dev-tools/travis/travis-script.sh | 15 +-
docs/documentation/Documentation.md | 4 +
docs/documentation/FAQ.md | 2 +-
docs/documentation/Log-Search.md | 14 +
.../Message-passing-implementation.md | 34 +-
docs/documentation/Pacemaker.md | 108 +
.../documentation/Setting-up-a-Storm-cluster.md | 19 +
docs/documentation/Windowing.md | 144 +
.../documentation/dynamic-log-level-settings.md | 41 +
docs/documentation/dynamic-worker-profiling.md | 29 +
.../images/dynamic_log_level_settings_1.png | Bin 0 -> 93689 bytes
.../images/dynamic_log_level_settings_2.png | Bin 0 -> 78785 bytes
.../images/dynamic_profiling_debugging_1.png | Bin 0 -> 93635 bytes
.../images/dynamic_profiling_debugging_2.png | Bin 0 -> 138120 bytes
.../images/dynamic_profiling_debugging_3.png | Bin 0 -> 96974 bytes
docs/documentation/images/search-a-topology.png | Bin 0 -> 671031 bytes
.../images/search-for-a-single-worker-log.png | Bin 0 -> 736579 bytes
.../storm-metrics-profiling-internal-actions.md | 70 +
docs/documentation/ui-rest-api.md | 996 +
docs/images/viewing_metrics_with_VisualVM.png | Bin 0 -> 225100 bytes
examples/storm-starter/pom.xml | 17 +-
.../storm/starter/FastWordCountTopology.java | 198 +
.../jvm/storm/starter/InOrderDeliveryTest.java | 175 +
.../storm/starter/MultipleLoggerTopology.java | 105 +
.../starter/ResourceAwareExampleTopology.java | 101 +
.../storm/starter/SlidingWindowTopology.java | 185 +
.../jvm/storm/starter/ThroughputVsLatency.java | 432 +
.../bolt/IntermediateRankingsBoltTest.java | 2 +-
.../starter/bolt/RollingCountBoltTest.java | 2 +-
.../starter/bolt/TotalRankingsBoltTest.java | 2 +-
.../storm/starter/tools/MockTupleHelpers.java | 40 -
external/flux/README.md | 4 +
external/flux/flux-core/pom.xml | 1 -
.../main/java/org/apache/storm/flux/Flux.java | 3 +-
.../java/org/apache/storm/flux/FluxBuilder.java | 55 +-
.../org/apache/storm/flux/model/ObjectDef.java | 2 +
.../org/apache/storm/flux/test/TestBolt.java | 8 +
.../resources/configs/config-methods-test.yaml | 2 +
external/flux/flux-examples/README.md | 9 +
external/flux/flux-examples/pom.xml | 1 -
.../storm/flux/examples/TestPrintBolt.java | 39 +
.../storm/flux/examples/TestWindowBolt.java | 47 +
.../src/main/resources/simple_windowing.yaml | 69 +
.../storm/sql/compiler/TestCompilerUtils.java | 17 +
.../org/apache/storm/sql/kafka/JsonScheme.java | 6 +-
.../storm/sql/kafka/TestJsonRepresentation.java | 2 +-
.../sql/kafka/TestKafkaDataSourcesProvider.java | 12 +-
external/storm-elasticsearch/pom.xml | 5 +
external/storm-eventhubs/pom.xml | 1 -
external/storm-hbase/README.md | 10 +
.../storm/hbase/bolt/AbstractHBaseBolt.java | 2 +
.../org/apache/storm/hbase/bolt/HBaseBolt.java | 75 +-
external/storm-hdfs/README.md | 33 +
external/storm-hdfs/pom.xml | 71 +-
.../storm/hdfs/bolt/AbstractHdfsBolt.java | 124 +
.../storm/hdfs/bolt/AvroGenericRecordBolt.java | 145 +
.../org/apache/storm/hdfs/bolt/HdfsBolt.java | 51 +-
.../storm/hdfs/bolt/SequenceFileBolt.java | 42 +-
.../ha/codedistributor/HDFSCodeDistributor.java | 17 +
.../hdfs/bolt/AvroGenericRecordBoltTest.java | 220 +
.../apache/storm/hdfs/bolt/TestHdfsBolt.java | 258 +
.../storm/hdfs/bolt/TestSequenceFileBolt.java | 186 +
.../storm/hdfs/trident/HdfsStateTest.java | 17 +
external/storm-hive/pom.xml | 7 +
.../org/apache/storm/hive/bolt/HiveBolt.java | 9 +
.../apache/storm/hive/bolt/TestHiveBolt.java | 56 +-
.../storm/jdbc/bolt/AbstractJdbcBolt.java | 2 +
.../apache/storm/jdbc/bolt/JdbcInsertBolt.java | 9 +
.../apache/storm/jdbc/bolt/JdbcLookupBolt.java | 5 +
.../jdbc/mapper/SimpleJdbcLookupMapper.java | 3 +
.../storm/jdbc/mapper/SimpleJdbcMapper.java | 5 +
.../storm/jdbc/bolt/JdbcInsertBoltTest.java | 71 +
.../storm/jdbc/bolt/JdbcLookupBoltTest.java | 59 +
external/storm-kafka/README.md | 64 +-
external/storm-kafka/pom.xml | 5 +
.../jvm/storm/kafka/DynamicBrokersReader.java | 97 +-
.../kafka/DynamicPartitionConnections.java | 20 +-
.../src/jvm/storm/kafka/KafkaConfig.java | 3 +-
.../src/jvm/storm/kafka/KafkaSpout.java | 34 +-
.../src/jvm/storm/kafka/KafkaUtils.java | 95 +-
.../src/jvm/storm/kafka/KeyValueScheme.java | 5 +-
.../kafka/KeyValueSchemeAsMultiScheme.java | 5 +-
.../jvm/storm/kafka/MessageMetadataScheme.java | 27 +
.../MessageMetadataSchemeAsMultiScheme.java | 41 +
.../src/jvm/storm/kafka/Partition.java | 26 +-
.../src/jvm/storm/kafka/PartitionManager.java | 47 +-
.../src/jvm/storm/kafka/StaticCoordinator.java | 11 +-
.../jvm/storm/kafka/StringKeyValueScheme.java | 3 +-
.../kafka/StringMessageAndMetadataScheme.java | 43 +
.../storm/kafka/StringMultiSchemeWithTopic.java | 48 +
.../src/jvm/storm/kafka/StringScheme.java | 20 +-
.../src/jvm/storm/kafka/ZkCoordinator.java | 2 +-
.../jvm/storm/kafka/trident/Coordinator.java | 7 +-
.../trident/GlobalPartitionInformation.java | 26 +-
.../jvm/storm/kafka/trident/IBrokerReader.java | 7 +-
.../kafka/trident/OpaqueTridentKafkaSpout.java | 9 +-
.../storm/kafka/trident/StaticBrokerReader.java | 23 +-
.../trident/TransactionalTridentKafkaSpout.java | 4 +-
.../kafka/trident/TridentKafkaEmitter.java | 48 +-
.../jvm/storm/kafka/trident/ZkBrokerReader.java | 20 +-
.../storm/kafka/DynamicBrokersReaderTest.java | 114 +-
.../src/test/storm/kafka/KafkaUtilsTest.java | 112 +-
.../storm/kafka/StringKeyValueSchemeTest.java | 17 +-
.../src/test/storm/kafka/TestStringScheme.java | 40 +
.../src/test/storm/kafka/TestUtils.java | 4 +-
.../src/test/storm/kafka/ZkCoordinatorTest.java | 8 +-
.../test/storm/kafka/bolt/KafkaBoltTest.java | 13 +-
external/storm-metrics/pom.xml | 107 +
.../metrics/hdrhistogram/HistogramMetric.java | 79 +
.../apache/storm/metrics/sigar/CPUMetric.java | 60 +
external/storm-solr/pom.xml | 21 +-
log4j2/cluster.xml | 42 +-
log4j2/worker.xml | 22 +-
pom.xml | 290 +-
storm-core/pom.xml | 327 +-
storm-core/src/clj/backtype/storm/cluster.clj | 341 +-
.../cluster_state/zookeeper_state_factory.clj | 157 +
.../clj/backtype/storm/command/healthcheck.clj | 88 +
.../clj/backtype/storm/command/heartbeats.clj | 52 +
.../clj/backtype/storm/command/kill_workers.clj | 33 +
.../backtype/storm/command/set_log_level.clj | 75 +
storm-core/src/clj/backtype/storm/config.clj | 112 +-
storm-core/src/clj/backtype/storm/converter.clj | 73 +-
.../backtype/storm/daemon/builtin_metrics.clj | 84 +-
.../src/clj/backtype/storm/daemon/common.clj | 42 +-
.../src/clj/backtype/storm/daemon/drpc.clj | 46 +-
.../src/clj/backtype/storm/daemon/executor.clj | 273 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 1060 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 652 +-
.../clj/backtype/storm/daemon/supervisor.clj | 283 +-
.../src/clj/backtype/storm/daemon/task.clj | 24 +-
.../src/clj/backtype/storm/daemon/worker.clj | 270 +-
storm-core/src/clj/backtype/storm/disruptor.clj | 53 +-
.../src/clj/backtype/storm/local_state.clj | 44 +-
storm-core/src/clj/backtype/storm/log.clj | 12 +-
.../src/clj/backtype/storm/messaging/loader.clj | 76 +-
.../src/clj/backtype/storm/messaging/local.clj | 56 +-
storm-core/src/clj/backtype/storm/stats.clj | 1519 +-
storm-core/src/clj/backtype/storm/testing.clj | 34 +-
storm-core/src/clj/backtype/storm/timer.clj | 20 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 1356 +-
.../src/clj/backtype/storm/ui/helpers.clj | 77 +-
storm-core/src/clj/backtype/storm/util.clj | 82 +-
.../org/apache/storm/pacemaker/pacemaker.clj | 237 +
.../storm/pacemaker/pacemaker_state_factory.clj | 124 +
.../src/dev/logviewer-search-context-tests.log | 1 +
.../dev/logviewer-search-context-tests.log.gz | Bin 0 -> 72 bytes
storm-core/src/dev/small-worker.log | 1 +
storm-core/src/dev/test-3072.log | 3 +
storm-core/src/dev/test-worker.log | 380 +
storm-core/src/genthrift.sh | 2 +-
storm-core/src/jvm/backtype/storm/Config.java | 868 +-
.../jvm/backtype/storm/ConfigValidation.java | 375 -
.../src/jvm/backtype/storm/LogWriter.java | 2 +-
.../src/jvm/backtype/storm/StormSubmitter.java | 55 +-
.../backtype/storm/cluster/ClusterState.java | 208 +
.../storm/cluster/ClusterStateContext.java | 41 +
.../storm/cluster/ClusterStateFactory.java | 28 +
.../storm/cluster/ClusterStateListener.java | 22 +
.../backtype/storm/cluster/ConnectionState.java | 24 +
.../jvm/backtype/storm/cluster/DaemonType.java | 27 +
.../storm/codedistributor/ICodeDistributor.java | 17 +
.../LocalFileSystemCodeDistributor.java | 17 +
.../storm/coordination/BatchBoltExecutor.java | 4 +-
.../storm/coordination/CoordinatedBolt.java | 16 +-
.../storm/drpc/DRPCInvocationsClient.java | 5 +-
.../src/jvm/backtype/storm/drpc/DRPCSpout.java | 10 +-
.../src/jvm/backtype/storm/drpc/JoinResult.java | 8 +-
.../storm/generated/AlreadyAliveException.java | 4 +-
.../backtype/storm/generated/Assignment.java | 380 +-
.../storm/generated/AuthorizationException.java | 4 +-
.../src/jvm/backtype/storm/generated/Bolt.java | 4 +-
.../storm/generated/BoltAggregateStats.java | 704 +
.../jvm/backtype/storm/generated/BoltStats.java | 444 +-
.../storm/generated/ClusterSummary.java | 221 +-
.../storm/generated/ClusterWorkerHeartbeat.java | 60 +-
.../storm/generated/CommonAggregateStats.java | 902 +
.../generated/ComponentAggregateStats.java | 752 +
.../storm/generated/ComponentCommon.java | 6 +-
.../storm/generated/ComponentObject.java | 2 +-
.../storm/generated/ComponentPageInfo.java | 2194 ++
.../backtype/storm/generated/ComponentType.java | 62 +
.../backtype/storm/generated/Credentials.java | 48 +-
.../storm/generated/DRPCExecutionException.java | 4 +-
.../backtype/storm/generated/DRPCRequest.java | 4 +-
.../backtype/storm/generated/DebugOptions.java | 8 +-
.../storm/generated/DistributedRPC.java | 4 +-
.../generated/DistributedRPCInvocations.java | 4 +-
.../jvm/backtype/storm/generated/ErrorInfo.java | 8 +-
.../storm/generated/ExecutorAggregateStats.java | 526 +
.../backtype/storm/generated/ExecutorInfo.java | 8 +-
.../storm/generated/ExecutorSpecificStats.java | 2 +-
.../backtype/storm/generated/ExecutorStats.java | 174 +-
.../storm/generated/ExecutorSummary.java | 8 +-
.../storm/generated/GetInfoOptions.java | 4 +-
.../storm/generated/GlobalStreamId.java | 4 +-
.../jvm/backtype/storm/generated/Grouping.java | 2 +-
.../generated/HBAuthorizationException.java | 406 +
.../storm/generated/HBExecutionException.java | 406 +
.../jvm/backtype/storm/generated/HBMessage.java | 636 +
.../backtype/storm/generated/HBMessageData.java | 640 +
.../jvm/backtype/storm/generated/HBNodes.java | 461 +
.../jvm/backtype/storm/generated/HBPulse.java | 522 +
.../jvm/backtype/storm/generated/HBRecords.java | 466 +
.../storm/generated/HBServerMessageType.java | 113 +
.../generated/InvalidTopologyException.java | 4 +-
.../backtype/storm/generated/JavaObject.java | 4 +-
.../backtype/storm/generated/JavaObjectArg.java | 2 +-
.../backtype/storm/generated/KillOptions.java | 6 +-
.../storm/generated/LSApprovedWorkers.java | 48 +-
.../generated/LSSupervisorAssignments.java | 52 +-
.../storm/generated/LSSupervisorId.java | 4 +-
.../backtype/storm/generated/LSTopoHistory.java | 805 +
.../storm/generated/LSTopoHistoryList.java | 460 +
.../storm/generated/LSWorkerHeartbeat.java | 44 +-
.../storm/generated/LocalAssignment.java | 157 +-
.../storm/generated/LocalStateData.java | 52 +-
.../jvm/backtype/storm/generated/LogConfig.java | 475 +
.../jvm/backtype/storm/generated/LogLevel.java | 836 +
.../storm/generated/LogLevelAction.java | 65 +
.../jvm/backtype/storm/generated/Nimbus.java | 18163 ++++++++++++-----
.../backtype/storm/generated/NimbusSummary.java | 10 +-
.../jvm/backtype/storm/generated/NodeInfo.java | 36 +-
.../storm/generated/NotAliveException.java | 4 +-
.../backtype/storm/generated/NullStruct.java | 4 +-
.../storm/generated/NumErrorsChoice.java | 2 +-
.../backtype/storm/generated/ProfileAction.java | 74 +
.../storm/generated/ProfileRequest.java | 631 +
.../storm/generated/RebalanceOptions.java | 52 +-
.../storm/generated/ShellComponent.java | 4 +-
.../storm/generated/SpecificAggregateStats.java | 387 +
.../storm/generated/SpoutAggregateStats.java | 407 +
.../jvm/backtype/storm/generated/SpoutSpec.java | 4 +-
.../backtype/storm/generated/SpoutStats.java | 256 +-
.../storm/generated/StateSpoutSpec.java | 4 +-
.../jvm/backtype/storm/generated/StormBase.java | 100 +-
.../backtype/storm/generated/StormTopology.java | 255 +-
.../backtype/storm/generated/StreamInfo.java | 6 +-
.../backtype/storm/generated/SubmitOptions.java | 4 +-
.../storm/generated/SupervisorInfo.java | 282 +-
.../storm/generated/SupervisorSummary.java | 374 +-
.../storm/generated/ThriftSerializedObject.java | 4 +-
.../storm/generated/TopologyActionOptions.java | 2 +-
.../storm/generated/TopologyHistoryInfo.java | 461 +
.../backtype/storm/generated/TopologyInfo.java | 774 +-
.../storm/generated/TopologyInitialStatus.java | 2 +-
.../storm/generated/TopologyPageInfo.java | 2597 +++
.../backtype/storm/generated/TopologyStats.java | 1094 +
.../storm/generated/TopologyStatus.java | 2 +-
.../storm/generated/TopologySummary.java | 618 +-
.../storm/generated/WorkerResources.java | 605 +
.../src/jvm/backtype/storm/grouping/Load.java | 77 +
.../grouping/LoadAwareCustomStreamGrouping.java | 24 +
.../grouping/LoadAwareShuffleGrouping.java | 76 +
.../backtype/storm/grouping/LoadMapping.java | 64 +
.../storm/grouping/PartialKeyGrouping.java | 5 +-
.../storm/grouping/ShuffleGrouping.java | 65 +
.../backtype/storm/hooks/BaseWorkerHook.java | 51 +
.../jvm/backtype/storm/hooks/IWorkerHook.java | 44 +
.../storm/logging/ThriftAccessLogger.java | 27 +
.../logging/filters/AccessLoggingFilter.java | 52 +
.../storm/messaging/AddressedTuple.java | 46 +
.../storm/messaging/ConnectionWithStatus.java | 4 +-
.../DeserializingConnectionCallback.java | 60 +
.../backtype/storm/messaging/IConnection.java | 26 +-
.../storm/messaging/IConnectionCallback.java | 31 +
.../jvm/backtype/storm/messaging/IContext.java | 2 +-
.../storm/messaging/TransportFactory.java | 2 +-
.../backtype/storm/messaging/local/Context.java | 164 +
.../backtype/storm/messaging/netty/Client.java | 115 +-
.../backtype/storm/messaging/netty/Context.java | 8 +-
.../storm/messaging/netty/ControlMessage.java | 22 +-
.../messaging/netty/INettySerializable.java | 26 +
.../storm/messaging/netty/ISaslClient.java | 28 +
.../storm/messaging/netty/ISaslServer.java | 26 +
.../backtype/storm/messaging/netty/IServer.java | 26 +
.../netty/KerberosSaslClientHandler.java | 152 +
.../netty/KerberosSaslNettyClient.java | 203 +
.../netty/KerberosSaslNettyClientState.java | 31 +
.../netty/KerberosSaslNettyServer.java | 210 +
.../netty/KerberosSaslNettyServerState.java | 30 +
.../netty/KerberosSaslServerHandler.java | 133 +
.../storm/messaging/netty/MessageBatch.java | 14 +-
.../storm/messaging/netty/MessageDecoder.java | 11 +-
.../netty/NettyRenameThreadFactory.java | 10 +-
.../netty/NettyUncaughtExceptionHandler.java | 35 +
.../storm/messaging/netty/SaslMessageToken.java | 33 +-
.../storm/messaging/netty/SaslNettyClient.java | 28 +-
.../storm/messaging/netty/SaslNettyServer.java | 248 +-
.../messaging/netty/SaslNettyServerState.java | 13 +-
.../messaging/netty/SaslStormClientHandler.java | 41 +-
.../messaging/netty/SaslStormServerHandler.java | 32 +-
.../storm/messaging/netty/SaslUtils.java | 12 +-
.../backtype/storm/messaging/netty/Server.java | 232 +-
.../messaging/netty/StormClientHandler.java | 51 +-
.../netty/StormClientPipelineFactory.java | 11 +-
.../messaging/netty/StormServerHandler.java | 24 +-
.../backtype/storm/metric/EventLoggerBolt.java | 25 +-
.../storm/metric/FileBasedEventLogger.java | 37 +-
.../metric/HttpForwardingMetricsConsumer.java | 80 +
.../metric/HttpForwardingMetricsServer.java | 118 +
.../jvm/backtype/storm/metric/IEventLogger.java | 25 +-
.../storm/metric/LoggingMetricsConsumer.java | 1 -
.../storm/metric/MetricsConsumerBolt.java | 1 -
.../jvm/backtype/storm/metric/SystemBolt.java | 5 -
.../backtype/storm/metric/api/CountMetric.java | 2 -
.../backtype/storm/metric/api/MeanReducer.java | 4 +-
.../storm/metric/api/MultiCountMetric.java | 2 +-
.../storm/metric/api/MultiReducedMetric.java | 2 +-
.../storm/metric/api/rpc/CountShellMetric.java | 3 +-
.../metric/internal/CountStatAndMetric.java | 211 +
.../metric/internal/LatencyStatAndMetric.java | 262 +
.../storm/metric/internal/MetricStatTimer.java | 27 +
.../internal/MultiCountStatAndMetric.java | 112 +
.../internal/MultiLatencyStatAndMetric.java | 109 +
.../storm/metric/internal/RateTracker.java | 165 +
.../AbstractDNSToSwitchMapping.java | 95 +
.../networktopography/DNSToSwitchMapping.java | 50 +
.../DefaultRackDNSToSwitchMapping.java | 52 +
.../backtype/storm/nimbus/ILeaderElector.java | 23 +-
.../nimbus/ITopologyActionNotifierPlugin.java | 43 +
.../jvm/backtype/storm/nimbus/NimbusInfo.java | 29 +-
.../jvm/backtype/storm/scheduler/Cluster.java | 234 +-
.../scheduler/SchedulerAssignmentImpl.java | 15 +-
.../storm/scheduler/SupervisorDetails.java | 63 +-
.../backtype/storm/scheduler/Topologies.java | 27 +-
.../storm/scheduler/TopologyDetails.java | 377 +-
.../backtype/storm/scheduler/WorkerSlot.java | 25 +
.../scheduler/multitenant/DefaultPool.java | 22 +-
.../storm/scheduler/multitenant/FreePool.java | 6 +-
.../scheduler/multitenant/IsolatedPool.java | 32 +-
.../multitenant/MultitenantScheduler.java | 6 +-
.../storm/scheduler/multitenant/Node.java | 17 +-
.../storm/scheduler/multitenant/NodePool.java | 16 +-
.../storm/scheduler/resource/Component.java | 54 +
.../storm/scheduler/resource/RAS_Node.java | 575 +
.../resource/ResourceAwareScheduler.java | 183 +
.../storm/scheduler/resource/ResourceUtils.java | 133 +
.../resource/strategies/IStrategy.java | 37 +
.../strategies/ResourceAwareStrategy.java | 479 +
.../backtype/storm/security/auth/AuthUtils.java | 96 +-
.../auth/DefaultHttpCredentialsPlugin.java | 6 +-
.../security/auth/DefaultPrincipalToLocal.java | 1 -
.../storm/security/auth/IAuthorizer.java | 4 +-
.../security/auth/ICredentialsRenewer.java | 3 +-
.../security/auth/IHttpCredentialsPlugin.java | 2 -
.../storm/security/auth/IPrincipalToLocal.java | 2 +-
.../storm/security/auth/ITransportPlugin.java | 4 -
.../security/auth/KerberosPrincipalToLocal.java | 2 +-
.../storm/security/auth/ReqContext.java | 18 +-
.../security/auth/SaslTransportPlugin.java | 12 +-
.../security/auth/ShellBasedGroupsMapping.java | 10 +-
.../security/auth/SimpleTransportPlugin.java | 8 +-
.../security/auth/SingleUserPrincipal.java | 5 +-
.../storm/security/auth/TBackoffConnect.java | 1 -
.../storm/security/auth/ThriftClient.java | 10 +-
.../storm/security/auth/ThriftServer.java | 6 +-
.../auth/authorizer/DRPCAuthorizerBase.java | 2 +-
.../authorizer/DRPCSimpleACLAuthorizer.java | 19 +-
.../auth/authorizer/DenyAuthorizer.java | 16 +-
.../authorizer/ImpersonationAuthorizer.java | 17 +-
.../auth/authorizer/NoopAuthorizer.java | 12 +-
.../auth/authorizer/SimpleACLAuthorizer.java | 45 +-
.../authorizer/SimpleWhitelistAuthorizer.java | 16 +-
.../auth/digest/ClientCallbackHandler.java | 2 -
.../auth/digest/DigestSaslTransportPlugin.java | 2 -
.../auth/digest/ServerCallbackHandler.java | 5 +-
.../storm/security/auth/kerberos/AutoTGT.java | 10 +-
.../security/auth/kerberos/NoOpTTrasport.java | 20 +-
.../auth/kerberos/ServerCallbackHandler.java | 2 +
.../serialization/BlowfishTupleSerializer.java | 6 +-
.../GzipThriftSerializationDelegate.java | 1 -
.../storm/serialization/ITupleDeserializer.java | 1 -
.../serialization/KryoTupleDeserializer.java | 3 -
.../serialization/KryoValuesDeserializer.java | 3 +-
.../serialization/SerializationFactory.java | 23 +-
.../jvm/backtype/storm/spout/MultiScheme.java | 3 +-
.../backtype/storm/spout/RawMultiScheme.java | 3 +-
.../src/jvm/backtype/storm/spout/RawScheme.java | 9 +-
.../src/jvm/backtype/storm/spout/Scheme.java | 3 +-
.../storm/spout/SchemeAsMultiScheme.java | 3 +-
.../jvm/backtype/storm/spout/ShellSpout.java | 10 +-
.../storm/task/GeneralTopologyContext.java | 15 +-
.../backtype/storm/task/OutputCollector.java | 2 +-
.../src/jvm/backtype/storm/task/ShellBolt.java | 48 +-
.../backtype/storm/task/TopologyContext.java | 9 +-
.../AlternateRackDNSToSwitchMapping.java | 65 +
.../storm/testing/MemoryTransactionalSpout.java | 9 +-
.../testing/OpaqueMemoryTransactionalSpout.java | 8 +-
.../storm/testing/TupleCaptureBolt.java | 4 +-
.../topology/BaseConfigurationDeclarer.java | 31 +-
.../storm/topology/BasicBoltExecutor.java | 2 +-
.../ComponentConfigurationDeclarer.java | 3 +
.../backtype/storm/topology/IWindowedBolt.java | 40 +
.../storm/topology/OutputFieldsGetter.java | 2 +-
.../storm/topology/TopologyBuilder.java | 78 +-
.../storm/topology/WindowedBoltExecutor.java | 224 +
.../storm/topology/base/BaseBatchBolt.java | 1 -
.../topology/base/BaseTransactionalSpout.java | 1 -
.../storm/topology/base/BaseWindowedBolt.java | 179 +
.../TransactionalSpoutBatchExecutor.java | 4 +-
.../TransactionalSpoutCoordinator.java | 2 +-
...uePartitionedTransactionalSpoutExecutor.java | 13 +-
.../PartitionedTransactionalSpoutExecutor.java | 2 +-
.../backtype/storm/tuple/AddressedTuple.java | 48 +
.../src/jvm/backtype/storm/tuple/Fields.java | 10 +-
.../src/jvm/backtype/storm/tuple/MessageId.java | 10 +-
.../src/jvm/backtype/storm/tuple/Tuple.java | 9 +-
.../src/jvm/backtype/storm/tuple/TupleImpl.java | 17 +-
.../jvm/backtype/storm/utils/DRPCClient.java | 1 -
.../backtype/storm/utils/DisruptorQueue.java | 610 +-
.../backtype/storm/utils/InprocMessaging.java | 4 +-
.../storm/utils/KeyedRoundRobinQueue.java | 6 +-
.../jvm/backtype/storm/utils/ListDelegate.java | 6 +-
.../jvm/backtype/storm/utils/LocalState.java | 22 +-
.../src/jvm/backtype/storm/utils/Monitor.java | 3 +-
.../jvm/backtype/storm/utils/MutableObject.java | 6 +-
.../jvm/backtype/storm/utils/NimbusClient.java | 10 +-
.../jvm/backtype/storm/utils/RateTracker.java | 119 -
.../storm/utils/RegisteredGlobalState.java | 6 +-
.../jvm/backtype/storm/utils/RotatingMap.java | 2 +-
.../backtype/storm/utils/ServiceRegistry.java | 2 +-
.../jvm/backtype/storm/utils/ShellProcess.java | 6 +-
.../jvm/backtype/storm/utils/ShellUtils.java | 2 +-
.../StormBoundedExponentialBackoffRetry.java | 3 +-
.../storm/utils/ThriftTopologyUtils.java | 36 +-
.../src/jvm/backtype/storm/utils/Time.java | 16 +-
.../backtype/storm/utils/TransferDrainer.java | 17 +-
.../src/jvm/backtype/storm/utils/Utils.java | 489 +-
.../jvm/backtype/storm/utils/VersionInfo.java | 2 +-
.../storm/validation/ConfigValidation.java | 646 +
.../validation/ConfigValidationAnnotations.java | 214 +
.../storm/validation/ConfigValidationUtils.java | 175 +
.../storm/windowing/CountEvictionPolicy.java | 68 +
.../storm/windowing/CountTriggerPolicy.java | 63 +
.../src/jvm/backtype/storm/windowing/Event.java | 41 +
.../jvm/backtype/storm/windowing/EventImpl.java | 38 +
.../storm/windowing/EvictionPolicy.java | 42 +
.../storm/windowing/TimeEvictionPolicy.java | 52 +
.../storm/windowing/TimeTriggerPolicy.java | 115 +
.../storm/windowing/TriggerHandler.java | 29 +
.../backtype/storm/windowing/TriggerPolicy.java | 42 +
.../backtype/storm/windowing/TupleWindow.java | 26 +
.../storm/windowing/TupleWindowImpl.java | 61 +
.../jvm/backtype/storm/windowing/Window.java | 48 +
.../windowing/WindowLifecycleListener.java | 42 +
.../backtype/storm/windowing/WindowManager.java | 212 +
.../storm/pacemaker/IServerMessageHandler.java | 25 +
.../apache/storm/pacemaker/PacemakerClient.java | 255 +
.../storm/pacemaker/PacemakerClientHandler.java | 75 +
.../apache/storm/pacemaker/PacemakerServer.java | 163 +
.../storm/pacemaker/codec/ThriftDecoder.java | 76 +
.../storm/pacemaker/codec/ThriftEncoder.java | 110 +
.../pacemaker/codec/ThriftNettyClientCodec.java | 94 +
.../pacemaker/codec/ThriftNettyServerCodec.java | 99 +
.../src/jvm/storm/trident/TridentTopology.java | 100 +-
.../trident/drpc/ReturnResultsReducer.java | 4 +-
.../fluent/ChainedAggregatorDeclarer.java | 8 +-
.../jvm/storm/trident/graph/GraphGrouper.java | 22 +-
.../src/jvm/storm/trident/graph/Group.java | 23 +-
.../trident/operation/builtin/SnapshotGet.java | 4 +-
.../operation/builtin/TupleCollectionGet.java | 6 +-
.../storm/trident/partition/GlobalGrouping.java | 5 +-
.../trident/partition/IdentityGrouping.java | 8 +-
.../src/jvm/storm/trident/planner/Node.java | 5 +-
.../storm/trident/planner/PartitionNode.java | 2 -
.../storm/trident/planner/SubtopologyBolt.java | 19 +-
.../processor/MultiReducerProcessor.java | 2 +-
.../jvm/storm/trident/spout/ITridentSpout.java | 51 +-
.../OpaquePartitionedTridentSpoutExecutor.java | 10 +-
.../trident/spout/TridentSpoutExecutor.java | 4 +-
.../trident/topology/TridentBoltExecutor.java | 10 +-
.../topology/TridentTopologyBuilder.java | 23 +-
.../storm/trident/tuple/TridentTupleView.java | 18 +-
.../jvm/storm/trident/util/TridentUtils.java | 33 +-
.../src/native/worker-launcher/impl/main.c | 10 +
.../worker-launcher/impl/worker-launcher.c | 49 +-
.../worker-launcher/impl/worker-launcher.h | 2 +
storm-core/src/py/storm/DistributedRPC-remote | 2 +-
storm-core/src/py/storm/DistributedRPC.py | 20 +-
.../py/storm/DistributedRPCInvocations-remote | 2 +-
.../src/py/storm/DistributedRPCInvocations.py | 41 +-
storm-core/src/py/storm/Nimbus-remote | 51 +-
storm-core/src/py/storm/Nimbus.py | 2383 ++-
storm-core/src/py/storm/constants.py | 2 +-
storm-core/src/py/storm/ttypes.py | 5870 ++++--
storm-core/src/storm.thrift | 262 +-
storm-core/src/ui/public/component.html | 167 +-
storm-core/src/ui/public/css/style.css | 16 +
.../src/ui/public/deep_search_result.html | 155 +
storm-core/src/ui/public/images/bug.png | Bin 0 -> 4045 bytes
storm-core/src/ui/public/images/search.png | Bin 0 -> 2354 bytes
storm-core/src/ui/public/images/statistic.png | Bin 0 -> 488 bytes
storm-core/src/ui/public/index.html | 10 +-
storm-core/src/ui/public/js/script.js | 20 +
.../src/ui/public/js/typeahead.jquery.min.js | 7 +
storm-core/src/ui/public/js/visualization.js | 92 +-
storm-core/src/ui/public/logviewer_search.html | 65 +
storm-core/src/ui/public/search_result.html | 100 +
.../templates/component-page-template.html | 55 +-
.../deep-search-result-page-template.html | 66 +
.../public/templates/index-page-template.html | 56 +-
.../logviewer-search-page-template.html | 44 +
.../templates/search-result-page-template.html | 60 +
.../templates/topology-page-template.html | 197 +-
.../src/ui/public/templates/user-template.html | 27 +-
storm-core/src/ui/public/topology.html | 168 +-
.../test/clj/backtype/storm/cluster_test.clj | 15 +-
.../test/clj/backtype/storm/config_test.clj | 186 -
.../test/clj/backtype/storm/grouping_test.clj | 90 +-
.../clj/backtype/storm/integration_test.clj | 12 +-
.../test/clj/backtype/storm/logviewer_test.clj | 730 +-
.../storm/messaging/netty_integration_test.clj | 3 +-
.../storm/messaging/netty_unit_test.clj | 288 +-
.../test/clj/backtype/storm/messaging_test.clj | 28 +-
.../test/clj/backtype/storm/metrics_test.clj | 2 +-
.../test/clj/backtype/storm/multilang_test.clj | 4 +-
.../test/clj/backtype/storm/nimbus_test.clj | 199 +-
.../scheduler/multitenant_scheduler_test.clj | 34 +-
.../scheduler/resource_aware_scheduler_test.clj | 669 +
.../test/clj/backtype/storm/scheduler_test.clj | 3 +-
.../auth/DefaultHttpCredentialsPlugin_test.clj | 40 +-
.../clj/backtype/storm/serialization_test.clj | 14 +-
.../test/clj/backtype/storm/supervisor_test.clj | 397 +-
.../test/clj/backtype/storm/testing4j_test.clj | 1 +
.../clj/backtype/storm/transactional_test.clj | 5 +-
.../test/clj/backtype/storm/worker_test.clj | 179 +-
.../storm/pacemaker_state_factory_test.clj | 150 +
.../clj/org/apache/storm/pacemaker_test.clj | 242 +
.../jvm/backtype/storm/TestConfigValidate.java | 660 +
.../metric/internal/CountStatAndMetricTest.java | 86 +
.../internal/LatencyStatAndMetricTest.java | 83 +
.../storm/metric/internal/RateTrackerTest.java | 94 +
.../nimbus/InMemoryTopologyActionNotifier.java | 53 +
.../storm/topology/TopologyBuilderTest.java | 5 +
.../utils/DisruptorQueueBackpressureTest.java | 17 +-
.../storm/utils/DisruptorQueueTest.java | 106 +-
.../backtype/storm/utils/MockTupleHelpers.java | 40 +
.../backtype/storm/utils/RateTrackerTest.java | 62 -
.../storm/utils/ThriftTopologyUtilsTest.java | 94 +
.../storm/windowing/WindowManagerTest.java | 250 +
.../jvm/storm/trident/TestTridentTopology.java | 76 +
storm-dist/binary/LICENSE | 29 +
storm-dist/binary/src/main/assembly/binary.xml | 37 -
561 files changed, 70178 insertions(+), 14724 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0f18238f/external/storm-kafka/README.md
----------------------------------------------------------------------
diff --cc external/storm-kafka/README.md
index a63284a,2fe930e..f6f14ac
--- a/external/storm-kafka/README.md
+++ b/external/storm-kafka/README.md
@@@ -218,9 -226,8 +226,9 @@@ You can return a null and the message w
DefaultTopicSelector.java and set the name of the topic in the constructor.
### Specifying Kafka producer properties
- You can provide all the produce properties , see http://kafka.apache.org/documentation.html#newproducerconfigs
-You can provide all the produce properties in your Storm topology by calling `KafkaBolt.withProducerProperties()` and `TridentKafkaStateFactory.withProducerProperties()`. Please see http://kafka.apache.org/documentation.html#newproducerconfigs
-Section "Important configuration properties for the producer" for more details.
++You can provide all the produce properties , see http://kafka.apache.org/documentation.html#producerconfigs
+section "Important configuration properties for the producer", in your Storm topology config by setting the properties
+map with key kafka.broker.properties.
###Using wildcard kafka topic match
You can do a wildcard topic match by adding the following config
@@@ -254,14 -269,7 +270,13 @@@ For the bolt
builder.setBolt("forwardToKafka", bolt, 8).shuffleGrouping("spout");
Config conf = new Config();
-
+ //set producer properties.
+ Properties props = new Properties();
- props.put("bootstrap.servers", "localhost:9092");
- props.put("acks", "1");
- props.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
- props.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
++ props.put("metadata.broker.list", "localhost:9092");
++ props.put("request.required.acks", "1");
++ props.put("serializer.class", "kafka.serializer.StringEncoder");
+ conf.put(KafkaBolt.KAFKA_BROKER_PROPERTIES, props);
-
++
StormSubmitter.submitTopology("kafkaboltTest", conf, builder.createTopology());
```
@@@ -294,13 -302,6 +309,12 @@@ For Trident
stream.partitionPersist(stateFactory, fields, new TridentKafkaUpdater(), new Fields());
Config conf = new Config();
+ //set producer properties.
+ Properties props = new Properties();
- props.put("bootstrap.servers", "localhost:9092");
- props.put("acks", "1");
- props.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
- props.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
++ props.put("metadata.broker.list", "localhost:9092");
++ props.put("request.required.acks", "1");
++ props.put("serializer.class", "kafka.serializer.StringEncoder");
+ conf.put(TridentKafkaState.KAFKA_BROKER_PROPERTIES, props);
StormSubmitter.submitTopology("kafkaTridentTest", conf, topology.build());
```