Merge branch 'STORM-1164' of https://github.com/sureshms/incubator-storm into STORM-1164
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1acadff4 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1acadff4 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1acadff4 Branch: refs/heads/master Commit: 1acadff444a6660f2fedd3466863736e30eb2f01 Parents: 5a4e1f8 f0e4c6f Author: Sriharsha Chintalapani <[email protected]> Authored: Mon Nov 9 16:57:05 2015 -0800 Committer: Sriharsha Chintalapani <[email protected]> Committed: Mon Nov 9 16:57:05 2015 -0800 ---------------------------------------------------------------------- storm-core/src/jvm/backtype/storm/Config.java | 36 ++++---- .../src/jvm/backtype/storm/LogWriter.java | 2 +- .../src/jvm/backtype/storm/StormSubmitter.java | 4 - .../storm/drpc/DRPCInvocationsClient.java | 5 +- .../storm/generated/AlreadyAliveException.java | 7 +- .../storm/grouping/PartialKeyGrouping.java | 5 +- .../storm/messaging/ConnectionWithStatus.java | 4 +- .../jvm/backtype/storm/messaging/IContext.java | 2 +- .../storm/messaging/TransportFactory.java | 2 +- .../backtype/storm/messaging/netty/Client.java | 2 +- .../backtype/storm/messaging/netty/Context.java | 8 +- .../storm/messaging/netty/ControlMessage.java | 5 +- .../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 | 4 +- .../messaging/netty/SaslStormServerHandler.java | 11 +-- .../storm/messaging/netty/SaslUtils.java | 11 +-- .../backtype/storm/messaging/netty/Server.java | 26 +++--- .../backtype/storm/metric/EventLoggerBolt.java | 8 -- .../storm/metric/FileBasedEventLogger.java | 2 +- .../metric/HttpForwardingMetricsConsumer.java | 1 - .../metric/HttpForwardingMetricsServer.java | 1 - .../jvm/backtype/storm/metric/IEventLogger.java | 8 +- .../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 +- .../AbstractDNSToSwitchMapping.java | 2 +- .../DefaultRackDNSToSwitchMapping.java | 4 +- .../backtype/storm/nimbus/ILeaderElector.java | 6 +- .../jvm/backtype/storm/nimbus/NimbusInfo.java | 4 +- .../jvm/backtype/storm/scheduler/Cluster.java | 5 +- .../scheduler/SchedulerAssignmentImpl.java | 15 ++-- .../storm/scheduler/SupervisorDetails.java | 6 +- .../backtype/storm/scheduler/Topologies.java | 6 +- .../storm/scheduler/TopologyDetails.java | 30 +++---- .../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 ++-- .../strategies/ResourceAwareStrategy.java | 39 +++++---- .../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/SimpleTransportPlugin.java | 6 +- .../security/auth/SingleUserPrincipal.java | 5 +- .../storm/security/auth/TBackoffConnect.java | 1 - .../storm/security/auth/ThriftClient.java | 10 +-- .../storm/security/auth/ThriftServer.java | 6 +- .../authorizer/DRPCSimpleACLAuthorizer.java | 11 ++- .../auth/authorizer/DenyAuthorizer.java | 11 +-- .../authorizer/ImpersonationAuthorizer.java | 10 +-- .../auth/authorizer/NoopAuthorizer.java | 7 +- .../auth/authorizer/SimpleACLAuthorizer.java | 18 ++-- .../authorizer/SimpleWhitelistAuthorizer.java | 4 - .../auth/digest/ClientCallbackHandler.java | 2 - .../auth/digest/DigestSaslTransportPlugin.java | 2 - .../auth/digest/ServerCallbackHandler.java | 5 +- .../GzipThriftSerializationDelegate.java | 1 - .../storm/serialization/ITupleDeserializer.java | 1 - .../serialization/KryoTupleDeserializer.java | 3 - .../serialization/KryoValuesDeserializer.java | 3 +- .../serialization/SerializationFactory.java | 17 ++-- .../storm/task/GeneralTopologyContext.java | 10 +-- .../backtype/storm/task/TopologyContext.java | 9 +- .../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 - .../TransactionalSpoutCoordinator.java | 2 +- ...uePartitionedTransactionalSpoutExecutor.java | 8 +- .../PartitionedTransactionalSpoutExecutor.java | 2 +- .../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 | 4 +- .../jvm/backtype/storm/utils/DRPCClient.java | 1 - .../backtype/storm/utils/DisruptorQueue.java | 5 +- .../backtype/storm/utils/InprocMessaging.java | 4 +- .../storm/utils/KeyedRoundRobinQueue.java | 6 +- .../jvm/backtype/storm/utils/ListDelegate.java | 6 +- .../src/jvm/backtype/storm/utils/Monitor.java | 3 +- .../jvm/backtype/storm/utils/NimbusClient.java | 10 +-- .../storm/utils/RegisteredGlobalState.java | 6 +- .../jvm/backtype/storm/utils/RotatingMap.java | 2 +- .../backtype/storm/utils/ServiceRegistry.java | 2 +- .../StormBoundedExponentialBackoffRetry.java | 3 +- .../jvm/backtype/storm/utils/VersionInfo.java | 2 +- .../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 +- .../trident/spout/TridentSpoutExecutor.java | 2 +- .../storm/trident/tuple/TridentTupleView.java | 6 +- .../storm/utils/DisruptorQueueTest.java | 7 +- 122 files changed, 378 insertions(+), 579 deletions(-) ----------------------------------------------------------------------
