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 2016/01/04 22:51:30 UTC

[2/6] storm git commit: Merge pull request #2 from apache/master

Merge pull request #2 from apache/master

merge 1117

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

Branch: refs/heads/master
Commit: 5261160f84bcb0ef73acf4a632d421f7e2ee901d
Parents: c1a89d9 5a79ba5
Author: Zhiqiang He <ab...@qq.com>
Authored: Tue Nov 17 10:57:09 2015 +0800
Committer: Zhiqiang He <ab...@qq.com>
Committed: Tue Nov 17 10:57:09 2015 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |   49 +
 DEVELOPER.md                                    |    2 +
 DISCLAIMER                                      |   10 -
 LICENSE                                         |   12 +
 README.markdown                                 |    6 +
 STORM-UI-REST-API.md                            |  718 --
 bin/flight.bash                                 |  154 +
 bin/storm-config.cmd                            |   10 +-
 bin/storm.py                                    |   27 +-
 conf/defaults.yaml                              |   14 +-
 conf/storm.yaml.example                         |    2 +-
 dev-tools/travis/ratprint.py                    |   26 +
 dev-tools/travis/travis-install.sh              |    5 +
 dev-tools/travis/travis-script.sh               |   10 +-
 docs/DYNAMIC_LOG_LEVEL_SETTINGS.md              |   41 -
 docs/documentation/Documentation.md             |    4 +
 docs/documentation/FAQ.md                       |    2 +-
 docs/documentation/Log-Search.md                |   14 +
 .../Message-passing-implementation.md           |   34 +-
 .../documentation/Setting-up-a-Storm-cluster.md |   19 +
 .../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               |  984 ++
 docs/images/dynamic_log_level_settings_1.png    |  Bin 93689 -> 0 bytes
 docs/images/dynamic_log_level_settings_2.png    |  Bin 78785 -> 0 bytes
 docs/images/viewing_metrics_with_VisualVM.png   |  Bin 0 -> 225100 bytes
 .../storm/starter/FastWordCountTopology.java    |  198 +
 .../jvm/storm/starter/InOrderDeliveryTest.java  |  175 +
 .../starter/ResourceAwareExampleTopology.java   |   20 +-
 .../jvm/storm/starter/ThroughputVsLatency.java  |   11 +-
 external/flux/README.md                         |    1 +
 .../main/java/org/apache/storm/flux/Flux.java   |    3 +-
 .../java/org/apache/storm/flux/FluxBuilder.java |   13 +
 .../org/apache/storm/flux/test/TestBolt.java    |    4 +
 .../resources/configs/config-methods-test.yaml  |    1 +
 external/storm-hdfs/README.md                   |   33 +
 .../storm/hdfs/bolt/AbstractHdfsBolt.java       |  124 +
 .../storm/hdfs/bolt/AvroGenericRecordBolt.java  |  145 +
 .../org/apache/storm/hdfs/bolt/HdfsBolt.java    |  114 +-
 .../storm/hdfs/bolt/SequenceFileBolt.java       |   42 +-
 .../ha/codedistributor/HDFSCodeDistributor.java |   17 +
 .../hdfs/bolt/AvroGenericRecordBoltTest.java    |  220 +
 .../storm/hdfs/bolt/TestSequenceFileBolt.java   |  186 +
 .../storm/hdfs/trident/HdfsStateTest.java       |   17 +
 .../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                  |   55 +-
 .../jvm/storm/kafka/DynamicBrokersReader.java   |   97 +-
 .../kafka/DynamicPartitionConnections.java      |   20 +-
 .../src/jvm/storm/kafka/KafkaConfig.java        |    3 +-
 .../src/jvm/storm/kafka/KafkaSpout.java         |    2 +-
 .../src/jvm/storm/kafka/KafkaUtils.java         |   93 +-
 .../jvm/storm/kafka/MessageMetadataScheme.java  |   25 +
 .../MessageMetadataSchemeAsMultiScheme.java     |   40 +
 .../src/jvm/storm/kafka/Partition.java          |   26 +-
 .../src/jvm/storm/kafka/PartitionManager.java   |   29 +-
 .../src/jvm/storm/kafka/StaticCoordinator.java  |   11 +-
 .../kafka/StringMessageAndMetadataScheme.java   |   42 +
 .../storm/kafka/StringMultiSchemeWithTopic.java |   57 +
 .../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  |    5 +-
 .../storm/kafka/trident/StaticBrokerReader.java |   23 +-
 .../kafka/trident/TridentKafkaEmitter.java      |   48 +-
 .../storm/kafka/trident/TridentKafkaState.java  |   25 +-
 .../jvm/storm/kafka/trident/ZkBrokerReader.java |   20 +-
 .../storm/kafka/DynamicBrokersReaderTest.java   |  114 +-
 .../src/test/storm/kafka/KafkaUtilsTest.java    |  110 +-
 .../src/test/storm/kafka/TestUtils.java         |   20 +-
 .../test/storm/kafka/TridentKafkaTopology.java  |    8 +-
 .../src/test/storm/kafka/ZkCoordinatorTest.java |    8 +-
 .../test/storm/kafka/bolt/KafkaBoltTest.java    |    4 +-
 external/storm-solr/pom.xml                     |   17 +
 log4j2/worker.xml                               |   12 +-
 pom.xml                                         |  140 +-
 storm-core/pom.xml                              |   49 +-
 storm-core/src/clj/backtype/storm/cluster.clj   |  134 +-
 .../clj/backtype/storm/command/healthcheck.clj  |   88 +
 storm-core/src/clj/backtype/storm/config.clj    |   49 +
 storm-core/src/clj/backtype/storm/converter.clj |   19 +-
 .../backtype/storm/daemon/builtin_metrics.clj   |   84 +-
 .../src/clj/backtype/storm/daemon/common.clj    |    5 +-
 .../src/clj/backtype/storm/daemon/drpc.clj      |   18 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |  262 +-
 .../src/clj/backtype/storm/daemon/logviewer.clj | 1040 +-
 .../src/clj/backtype/storm/daemon/nimbus.clj    |  313 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |  199 +-
 .../src/clj/backtype/storm/daemon/task.clj      |   24 +-
 .../src/clj/backtype/storm/daemon/worker.clj    |  104 +-
 storm-core/src/clj/backtype/storm/disruptor.clj |   53 +-
 .../src/clj/backtype/storm/local_state.clj      |   24 +
 .../src/clj/backtype/storm/messaging/loader.clj |   76 +-
 .../src/clj/backtype/storm/messaging/local.clj  |   56 +-
 storm-core/src/clj/backtype/storm/stats.clj     |  242 +-
 storm-core/src/clj/backtype/storm/testing.clj   |    3 +-
 storm-core/src/clj/backtype/storm/timer.clj     |   20 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   |  295 +-
 .../src/clj/backtype/storm/ui/helpers.clj       |   42 +-
 storm-core/src/clj/backtype/storm/util.clj      |   51 +-
 .../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   |  229 +-
 .../src/jvm/backtype/storm/LogWriter.java       |    2 +-
 .../src/jvm/backtype/storm/StormSubmitter.java  |   24 +-
 .../storm/codedistributor/ICodeDistributor.java |   17 +
 .../LocalFileSystemCodeDistributor.java         |   17 +
 .../storm/coordination/BatchBoltExecutor.java   |    4 +-
 .../storm/coordination/CoordinatedBolt.java     |   14 +-
 .../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    |    4 +-
 .../storm/generated/AuthorizationException.java |    4 +-
 .../src/jvm/backtype/storm/generated/Bolt.java  |    4 +-
 .../storm/generated/BoltAggregateStats.java     |   12 +-
 .../jvm/backtype/storm/generated/BoltStats.java |    4 +-
 .../storm/generated/ClusterSummary.java         |  113 +-
 .../storm/generated/ClusterWorkerHeartbeat.java |    8 +-
 .../storm/generated/CommonAggregateStats.java   |   16 +-
 .../generated/ComponentAggregateStats.java      |    4 +-
 .../storm/generated/ComponentCommon.java        |    6 +-
 .../storm/generated/ComponentObject.java        |    2 +-
 .../storm/generated/ComponentPageInfo.java      |   10 +-
 .../backtype/storm/generated/ComponentType.java |    2 +-
 .../backtype/storm/generated/Credentials.java   |    4 +-
 .../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 |    4 +-
 .../backtype/storm/generated/ExecutorInfo.java  |    8 +-
 .../storm/generated/ExecutorSpecificStats.java  |    2 +-
 .../backtype/storm/generated/ExecutorStats.java |    6 +-
 .../storm/generated/ExecutorSummary.java        |    8 +-
 .../storm/generated/GetInfoOptions.java         |    4 +-
 .../storm/generated/GlobalStreamId.java         |    4 +-
 .../jvm/backtype/storm/generated/Grouping.java  |    2 +-
 .../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      |    4 +-
 .../generated/LSSupervisorAssignments.java      |    4 +-
 .../storm/generated/LSSupervisorId.java         |    4 +-
 .../backtype/storm/generated/LSTopoHistory.java |  805 ++
 .../storm/generated/LSTopoHistoryList.java      |  460 +
 .../storm/generated/LSWorkerHeartbeat.java      |    8 +-
 .../storm/generated/LocalAssignment.java        |    4 +-
 .../storm/generated/LocalStateData.java         |    4 +-
 .../jvm/backtype/storm/generated/LogConfig.java |   52 +-
 .../jvm/backtype/storm/generated/LogLevel.java  |    8 +-
 .../storm/generated/LogLevelAction.java         |    2 +-
 .../jvm/backtype/storm/generated/Nimbus.java    | 9695 ++++++++++++------
 .../backtype/storm/generated/NimbusSummary.java |   10 +-
 .../jvm/backtype/storm/generated/NodeInfo.java  |    4 +-
 .../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       |    8 +-
 .../storm/generated/ShellComponent.java         |    4 +-
 .../storm/generated/SpecificAggregateStats.java |    2 +-
 .../storm/generated/SpoutAggregateStats.java    |    6 +-
 .../jvm/backtype/storm/generated/SpoutSpec.java |    4 +-
 .../backtype/storm/generated/SpoutStats.java    |    4 +-
 .../storm/generated/StateSpoutSpec.java         |    4 +-
 .../jvm/backtype/storm/generated/StormBase.java |    8 +-
 .../backtype/storm/generated/StormTopology.java |    4 +-
 .../backtype/storm/generated/StreamInfo.java    |    6 +-
 .../backtype/storm/generated/SubmitOptions.java |    4 +-
 .../storm/generated/SupervisorInfo.java         |    8 +-
 .../storm/generated/SupervisorSummary.java      |   10 +-
 .../storm/generated/ThriftSerializedObject.java |    4 +-
 .../storm/generated/TopologyActionOptions.java  |    2 +-
 .../storm/generated/TopologyHistoryInfo.java    |  461 +
 .../backtype/storm/generated/TopologyInfo.java  |  610 +-
 .../storm/generated/TopologyInitialStatus.java  |    2 +-
 .../storm/generated/TopologyPageInfo.java       |  618 +-
 .../backtype/storm/generated/TopologyStats.java |    4 +-
 .../storm/generated/TopologyStatus.java         |    2 +-
 .../storm/generated/TopologySummary.java        |  618 +-
 .../storm/generated/WorkerResources.java        |   10 +-
 .../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 +
 .../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  |  105 +-
 .../backtype/storm/messaging/netty/Context.java |    8 +-
 .../storm/messaging/netty/ControlMessage.java   |    5 +-
 .../storm/messaging/netty/ISaslClient.java      |   28 +
 .../storm/messaging/netty/ISaslServer.java      |   26 +
 .../backtype/storm/messaging/netty/IServer.java |   26 +
 .../storm/messaging/netty/MessageBatch.java     |   14 +-
 .../storm/messaging/netty/MessageDecoder.java   |    7 +-
 .../storm/messaging/netty/SaslMessageToken.java |   10 +-
 .../storm/messaging/netty/SaslNettyClient.java  |    6 +-
 .../storm/messaging/netty/SaslNettyServer.java  |    4 -
 .../messaging/netty/SaslStormClientHandler.java |   41 +-
 .../messaging/netty/SaslStormServerHandler.java |   11 +-
 .../storm/messaging/netty/SaslUtils.java        |   11 +-
 .../backtype/storm/messaging/netty/Server.java  |  198 +-
 .../messaging/netty/StormClientHandler.java     |   51 +-
 .../netty/StormClientPipelineFactory.java       |   11 +-
 .../backtype/storm/metric/EventLoggerBolt.java  |   25 +-
 .../storm/metric/FileBasedEventLogger.java      |   37 +-
 .../metric/HttpForwardingMetricsConsumer.java   |    1 -
 .../metric/HttpForwardingMetricsServer.java     |    1 -
 .../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   |  259 +
 .../storm/metric/internal/MetricStatTimer.java  |   27 +
 .../internal/MultiCountStatAndMetric.java       |  112 +
 .../internal/MultiLatencyStatAndMetric.java     |  109 +
 .../storm/metric/internal/RateTracker.java      |  165 +
 .../AbstractDNSToSwitchMapping.java             |    2 +-
 .../DefaultRackDNSToSwitchMapping.java          |   21 +-
 .../backtype/storm/nimbus/ILeaderElector.java   |   23 +-
 .../nimbus/ITopologyActionNotifierPlugin.java   |   43 +
 .../jvm/backtype/storm/nimbus/NimbusInfo.java   |   21 +-
 .../jvm/backtype/storm/scheduler/Cluster.java   |   85 +-
 .../scheduler/SchedulerAssignmentImpl.java      |   15 +-
 .../storm/scheduler/SupervisorDetails.java      |    6 +-
 .../backtype/storm/scheduler/Topologies.java    |   12 +-
 .../storm/scheduler/TopologyDetails.java        |   81 +-
 .../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 +-
 .../resource/ResourceAwareScheduler.java        |   38 +-
 .../strategies/ResourceAwareStrategy.java       |   69 +-
 .../backtype/storm/security/auth/AuthUtils.java |   27 +-
 .../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         |   11 +-
 .../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         |   11 +-
 .../authorizer/ImpersonationAuthorizer.java     |   17 +-
 .../auth/authorizer/NoopAuthorizer.java         |    7 +-
 .../auth/authorizer/SimpleACLAuthorizer.java    |   26 +-
 .../authorizer/SimpleWhitelistAuthorizer.java   |   11 +-
 .../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 +-
 .../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/ShellSpout.java    |    4 +-
 .../storm/task/GeneralTopologyContext.java      |   15 +-
 .../src/jvm/backtype/storm/task/ShellBolt.java  |   42 +-
 .../backtype/storm/task/TopologyContext.java    |    9 +-
 .../AlternateRackDNSToSwitchMapping.java        |   17 +
 .../storm/testing/MemoryTransactionalSpout.java |    9 +-
 .../testing/OpaqueMemoryTransactionalSpout.java |    8 +-
 .../storm/testing/TupleCaptureBolt.java         |    4 +-
 .../storm/topology/BasicBoltExecutor.java       |    2 +-
 .../storm/topology/OutputFieldsGetter.java      |    2 +-
 .../storm/topology/TopologyBuilder.java         |   16 +-
 .../storm/topology/base/BaseBatchBolt.java      |    1 -
 .../topology/base/BaseTransactionalSpout.java   |    1 -
 .../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     |    1 -
 .../src/jvm/backtype/storm/tuple/TupleImpl.java |   10 +-
 .../jvm/backtype/storm/utils/DRPCClient.java    |    1 -
 .../backtype/storm/utils/DisruptorQueue.java    |  572 +-
 .../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   |  166 -
 .../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 +-
 .../src/jvm/backtype/storm/utils/Time.java      |    4 +-
 .../backtype/storm/utils/TransferDrainer.java   |   17 +-
 .../src/jvm/backtype/storm/utils/Utils.java     |  344 +-
 .../jvm/backtype/storm/utils/VersionInfo.java   |    2 +-
 .../storm/validation/ConfigValidation.java      |  169 +-
 .../validation/ConfigValidationAnnotations.java |    8 +-
 .../src/jvm/storm/trident/TridentTopology.java  |   87 +-
 .../trident/drpc/ReturnResultsReducer.java      |    4 +-
 .../fluent/ChainedAggregatorDeclarer.java       |    8 +-
 .../jvm/storm/trident/graph/GraphGrouper.java   |   13 +-
 .../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   |    6 +-
 .../topology/TridentTopologyBuilder.java        |   23 +-
 .../storm/trident/tuple/TridentTupleView.java   |   18 +-
 .../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           |   23 +-
 storm-core/src/py/storm/Nimbus.py               | 1020 +-
 storm-core/src/py/storm/constants.py            |    2 +-
 storm-core/src/py/storm/ttypes.py               | 2008 +++-
 storm-core/src/storm.thrift                     |   56 +
 storm-core/src/ui/public/component.html         |  167 +-
 .../src/ui/public/deep_search_result.html       |  155 +
 storm-core/src/ui/public/images/search.png      |  Bin 0 -> 2354 bytes
 storm-core/src/ui/public/index.html             |    6 +-
 .../src/ui/public/js/typeahead.jquery.min.js    |    7 +
 storm-core/src/ui/public/logviewer_search.html  |   65 +
 storm-core/src/ui/public/search_result.html     |  100 +
 .../templates/component-page-template.html      |   53 +
 .../deep-search-result-page-template.html       |   66 +
 .../public/templates/index-page-template.html   |   18 +-
 .../logviewer-search-page-template.html         |   44 +
 .../templates/search-result-page-template.html  |   60 +
 .../templates/topology-page-template.html       |   71 +
 .../src/ui/public/templates/user-template.html  |   17 +-
 storm-core/src/ui/public/topology.html          |   16 +-
 .../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     |  145 +-
 .../scheduler/resource_aware_scheduler_test.clj |   38 +-
 .../test/clj/backtype/storm/supervisor_test.clj |  225 +-
 .../test/clj/backtype/storm/testing4j_test.clj  |    1 +
 .../clj/backtype/storm/transactional_test.clj   |    5 +-
 .../jvm/backtype/storm/TestConfigValidate.java  |   78 +
 .../metric/internal/CountStatAndMetricTest.java |   86 +
 .../internal/LatencyStatAndMetricTest.java      |   83 +
 .../storm/metric/internal/RateTrackerTest.java  |   94 +
 .../nimbus/InMemoryTopologyActionNotifier.java  |   53 +
 .../utils/DisruptorQueueBackpressureTest.java   |   17 +-
 .../storm/utils/DisruptorQueueTest.java         |  106 +-
 .../backtype/storm/utils/RateTrackerTest.java   |   94 -
 storm-dist/binary/src/main/assembly/binary.xml  |    5 -
 420 files changed, 26079 insertions(+), 8364 deletions(-)
----------------------------------------------------------------------