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 2018/06/07 15:55:26 UTC
[50/50] [abbrv] storm git commit: Merge branch 'STORM-2882' of
https://github.com/revans2/incubator-storm into STORM-2882
Merge branch 'STORM-2882' of https://github.com/revans2/incubator-storm into STORM-2882
STORM-2882: shade storm-client dependencies
this closes #2698
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ab976879
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ab976879
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ab976879
Branch: refs/heads/master
Commit: ab97687997c6b24a1c47cb2d84c07757501779eb
Parents: 3e098f1 35a1b8f
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 7 09:58:52 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu Jun 7 09:58:52 2018 -0500
----------------------------------------------------------------------
DEVELOPER.md | 2 -
dev-tools/travis/travis-install.sh | 11 +-
dev-tools/travis/travis-script.sh | 2 +-
examples/storm-loadgen/pom.xml | 16 +
examples/storm-perf/pom.xml | 4 +
external/storm-kafka-client/pom.xml | 4 +
external/storm-kafka-migration/pom.xml | 4 +
external/storm-rocketmq/pom.xml | 4 +
integration-test/pom.xml | 4 +
.../st/tests/window/SlidingWindowTest.java | 11 +-
.../apache/storm/st/wrapper/StormCluster.java | 17 +-
.../org/apache/storm/st/wrapper/TopoWrap.java | 53 +-
pom.xml | 37 +-
shaded-deps/pom.xml | 290 +
storm-client/pom.xml | 114 +-
storm-client/src/genthrift.sh | 2 +-
.../src/jvm/org/apache/storm/Config.java | 11 +-
.../src/jvm/org/apache/storm/ILocalCluster.java | 2 +-
.../jvm/org/apache/storm/StormSubmitter.java | 10 +-
.../src/jvm/org/apache/storm/Thrift.java | 2 +-
.../LocalAssignmentsBackendFactory.java | 2 +-
.../org/apache/storm/blobstore/BlobStore.java | 2 +-
.../storm/blobstore/BlobStoreAclHandler.java | 8 +-
.../apache/storm/blobstore/NimbusBlobStore.java | 2 +-
.../storm/callback/DefaultWatcherCallBack.java | 2 +-
.../apache/storm/callback/WatcherCallBack.java | 4 +-
.../storm/callback/ZKStateChangedCallback.java | 2 +-
.../storm/cluster/ClusterStateContext.java | 2 +-
.../org/apache/storm/cluster/ClusterUtils.java | 8 +-
.../org/apache/storm/cluster/DaemonType.java | 6 +-
.../org/apache/storm/cluster/IStateStorage.java | 4 +-
.../storm/cluster/PaceMakerStateStorage.java | 4 +-
.../storm/cluster/StormClusterStateImpl.java | 29 +-
.../apache/storm/cluster/ZKStateStorage.java | 21 +-
.../storm/container/cgroup/CgroupUtils.java | 2 +-
.../storm/container/cgroup/SystemOperation.java | 2 +-
.../org/apache/storm/daemon/GrouperFactory.java | 4 +-
.../org/apache/storm/daemon/StormCommon.java | 4 +-
.../storm/daemon/supervisor/AdvancedFSOps.java | 2 +-
.../supervisor/ClientSupervisorUtils.java | 2 +-
.../org/apache/storm/daemon/worker/Worker.java | 19 +-
.../apache/storm/daemon/worker/WorkerState.java | 4 +-
.../dependency/DependencyBlobStoreUtils.java | 7 +-
.../dependency/DependencyPropertiesParser.java | 14 +-
.../storm/dependency/DependencyUploader.java | 2 +-
.../storm/drpc/DRPCInvocationsClient.java | 4 +-
.../jvm/org/apache/storm/drpc/DRPCSpout.java | 4 +-
.../org/apache/storm/drpc/ReturnResults.java | 9 +-
.../jvm/org/apache/storm/executor/Executor.java | 10 +-
.../org/apache/storm/executor/TupleInfo.java | 4 +-
.../storm/executor/bolt/BoltExecutor.java | 2 +-
.../storm/executor/spout/SpoutExecutor.java | 2 +-
.../apache/storm/generated/AccessControl.java | 106 +-
.../storm/generated/AccessControlType.java | 2 +-
.../storm/generated/AlreadyAliveException.java | 74 +-
.../org/apache/storm/generated/Assignment.java | 212 +-
.../storm/generated/AuthorizationException.java | 74 +-
.../storm/generated/BeginDownloadResult.java | 116 +-
.../jvm/org/apache/storm/generated/Bolt.java | 88 +-
.../storm/generated/BoltAggregateStats.java | 140 +-
.../org/apache/storm/generated/BoltStats.java | 230 +-
.../apache/storm/generated/ClusterSummary.java | 144 +-
.../storm/generated/ClusterWorkerHeartbeat.java | 138 +-
.../storm/generated/CommonAggregateStats.java | 198 +-
.../generated/ComponentAggregateStats.java | 108 +-
.../apache/storm/generated/ComponentCommon.java | 138 +-
.../apache/storm/generated/ComponentObject.java | 74 +-
.../storm/generated/ComponentPageInfo.java | 334 +-
.../apache/storm/generated/ComponentType.java | 2 +-
.../org/apache/storm/generated/Credentials.java | 84 +-
.../storm/generated/DRPCExceptionType.java | 2 +-
.../storm/generated/DRPCExecutionException.java | 86 +-
.../org/apache/storm/generated/DRPCRequest.java | 88 +-
.../apache/storm/generated/DebugOptions.java | 98 +-
.../apache/storm/generated/DistributedRPC.java | 286 +-
.../generated/DistributedRPCInvocations.java | 904 +-
.../org/apache/storm/generated/ErrorInfo.java | 124 +-
.../storm/generated/ExecutorAggregateStats.java | 84 +-
.../apache/storm/generated/ExecutorInfo.java | 100 +-
.../storm/generated/ExecutorSpecificStats.java | 62 +-
.../apache/storm/generated/ExecutorStats.java | 164 +-
.../apache/storm/generated/ExecutorSummary.java | 154 +-
.../apache/storm/generated/GetInfoOptions.java | 72 +-
.../apache/storm/generated/GlobalStreamId.java | 88 +-
.../org/apache/storm/generated/Grouping.java | 124 +-
.../generated/HBAuthorizationException.java | 74 +-
.../storm/generated/HBExecutionException.java | 74 +-
.../org/apache/storm/generated/HBMessage.java | 102 +-
.../apache/storm/generated/HBMessageData.java | 98 +-
.../jvm/org/apache/storm/generated/HBNodes.java | 80 +-
.../jvm/org/apache/storm/generated/HBPulse.java | 98 +-
.../org/apache/storm/generated/HBRecords.java | 80 +-
.../storm/generated/HBServerMessageType.java | 2 +-
.../generated/InvalidTopologyException.java | 74 +-
.../org/apache/storm/generated/JavaObject.java | 96 +-
.../apache/storm/generated/JavaObjectArg.java | 98 +-
.../generated/KeyAlreadyExistsException.java | 74 +-
.../storm/generated/KeyNotFoundException.java | 74 +-
.../org/apache/storm/generated/KillOptions.java | 78 +-
.../storm/generated/LSApprovedWorkers.java | 84 +-
.../generated/LSSupervisorAssignments.java | 84 +-
.../apache/storm/generated/LSSupervisorId.java | 74 +-
.../apache/storm/generated/LSTopoHistory.java | 140 +-
.../storm/generated/LSTopoHistoryList.java | 82 +-
.../storm/generated/LSWorkerHeartbeat.java | 136 +-
.../apache/storm/generated/ListBlobsResult.java | 96 +-
.../apache/storm/generated/LocalAssignment.java | 140 +-
.../apache/storm/generated/LocalStateData.java | 84 +-
.../org/apache/storm/generated/LogConfig.java | 82 +-
.../org/apache/storm/generated/LogLevel.java | 136 +-
.../apache/storm/generated/LogLevelAction.java | 2 +-
.../jvm/org/apache/storm/generated/Nimbus.java | 11668 ++++++++---------
.../apache/storm/generated/NimbusSummary.java | 148 +-
.../org/apache/storm/generated/NodeInfo.java | 96 +-
.../storm/generated/NotAliveException.java | 74 +-
.../org/apache/storm/generated/NullStruct.java | 60 +-
.../apache/storm/generated/NumErrorsChoice.java | 2 +-
.../storm/generated/OwnerResourceSummary.java | 408 +-
.../storm/generated/PrivateWorkerKey.java | 122 +-
.../apache/storm/generated/ProfileAction.java | 2 +-
.../apache/storm/generated/ProfileRequest.java | 108 +-
.../storm/generated/ReadableBlobMeta.java | 96 +-
.../storm/generated/RebalanceOptions.java | 174 +-
.../storm/generated/SettableBlobMeta.java | 100 +-
.../apache/storm/generated/SharedMemory.java | 134 +-
.../apache/storm/generated/ShellComponent.java | 84 +-
.../storm/generated/SpecificAggregateStats.java | 62 +-
.../storm/generated/SpoutAggregateStats.java | 80 +-
.../org/apache/storm/generated/SpoutSpec.java | 88 +-
.../org/apache/storm/generated/SpoutStats.java | 162 +-
.../apache/storm/generated/StateSpoutSpec.java | 88 +-
.../org/apache/storm/generated/StormBase.java | 234 +-
.../apache/storm/generated/StormTopology.java | 274 +-
.../org/apache/storm/generated/StreamInfo.java | 102 +-
.../apache/storm/generated/SubmitOptions.java | 86 +-
.../org/apache/storm/generated/Supervisor.java | 686 +-
.../storm/generated/SupervisorAssignments.java | 82 +-
.../apache/storm/generated/SupervisorInfo.java | 246 +-
.../storm/generated/SupervisorPageInfo.java | 100 +-
.../storm/generated/SupervisorSummary.java | 266 +-
.../generated/SupervisorWorkerHeartbeat.java | 116 +-
.../generated/SupervisorWorkerHeartbeats.java | 96 +-
.../storm/generated/ThriftSerializedObject.java | 100 +-
.../storm/generated/TopologyActionOptions.java | 62 +-
.../storm/generated/TopologyHistoryInfo.java | 80 +-
.../apache/storm/generated/TopologyInfo.java | 376 +-
.../storm/generated/TopologyInitialStatus.java | 2 +-
.../storm/generated/TopologyPageInfo.java | 620 +-
.../apache/storm/generated/TopologyStats.java | 170 +-
.../apache/storm/generated/TopologyStatus.java | 2 +-
.../apache/storm/generated/TopologySummary.java | 372 +-
.../storm/generated/WorkerMetricList.java | 80 +-
.../storm/generated/WorkerMetricPoint.java | 160 +-
.../apache/storm/generated/WorkerMetrics.java | 122 +-
.../apache/storm/generated/WorkerResources.java | 204 +-
.../apache/storm/generated/WorkerSummary.java | 326 +-
.../org/apache/storm/generated/WorkerToken.java | 126 +-
.../apache/storm/generated/WorkerTokenInfo.java | 132 +-
.../storm/generated/WorkerTokenServiceType.java | 2 +-
.../grouping/LoadAwareShuffleGrouping.java | 4 +-
.../storm/grouping/PartialKeyGrouping.java | 3 +-
.../messaging/netty/BackPressureStatus.java | 4 +-
.../apache/storm/messaging/netty/Client.java | 18 +-
.../apache/storm/messaging/netty/Context.java | 4 +-
.../storm/messaging/netty/ControlMessage.java | 6 +-
.../messaging/netty/INettySerializable.java | 2 +-
.../storm/messaging/netty/ISaslClient.java | 2 +-
.../storm/messaging/netty/ISaslServer.java | 2 +-
.../apache/storm/messaging/netty/IServer.java | 2 +-
.../netty/KerberosSaslClientHandler.java | 12 +-
.../netty/KerberosSaslNettyClient.java | 6 +-
.../netty/KerberosSaslNettyClientState.java | 4 +-
.../netty/KerberosSaslNettyServer.java | 6 +-
.../netty/KerberosSaslNettyServerState.java | 4 +-
.../netty/KerberosSaslServerHandler.java | 12 +-
.../org/apache/storm/messaging/netty/Login.java | 4 +-
.../storm/messaging/netty/MessageBatch.java | 6 +-
.../storm/messaging/netty/MessageDecoder.java | 8 +-
.../storm/messaging/netty/MessageEncoder.java | 6 +-
.../netty/NettyRenameThreadFactory.java | 4 +-
.../storm/messaging/netty/SaslMessageToken.java | 6 +-
.../messaging/netty/SaslNettyClientState.java | 4 +-
.../messaging/netty/SaslNettyServerState.java | 4 +-
.../messaging/netty/SaslStormClientHandler.java | 12 +-
.../netty/SaslStormServerAuthorizeHandler.java | 10 +-
.../messaging/netty/SaslStormServerHandler.java | 12 +-
.../apache/storm/messaging/netty/SaslUtils.java | 4 +-
.../apache/storm/messaging/netty/Server.java | 12 +-
.../messaging/netty/StormClientHandler.java | 10 +-
.../netty/StormClientPipelineFactory.java | 6 +-
.../messaging/netty/StormServerHandler.java | 12 +-
.../netty/StormServerPipelineFactory.java | 6 +-
.../storm/metric/FileBasedEventLogger.java | 2 +-
.../storm/metric/MetricsConsumerBolt.java | 6 +-
.../storm/metric/filter/FilterByMetricName.java | 16 +-
.../storm/metric/filter/MetricsFilter.java | 2 +-
.../apache/storm/multilang/JsonSerializer.java | 6 +-
.../apache/storm/pacemaker/PacemakerClient.java | 14 +-
.../storm/pacemaker/PacemakerClientHandler.java | 12 +-
.../storm/pacemaker/codec/ThriftDecoder.java | 8 +-
.../storm/pacemaker/codec/ThriftEncoder.java | 10 +-
.../pacemaker/codec/ThriftNettyClientCodec.java | 10 +-
.../apache/storm/security/auth/AuthUtils.java | 560 -
.../org/apache/storm/security/auth/AutoSSL.java | 2 +-
.../storm/security/auth/ClientAuthUtils.java | 529 +
.../auth/DefaultHttpCredentialsPlugin.java | 91 -
.../security/auth/IHttpCredentialsPlugin.java | 44 -
.../storm/security/auth/ITransportPlugin.java | 10 +-
.../apache/storm/security/auth/ReqContext.java | 2 +-
.../security/auth/ShellBasedGroupsMapping.java | 2 +-
.../security/auth/SimpleTransportPlugin.java | 24 +-
.../storm/security/auth/TBackoffConnect.java | 4 +-
.../storm/security/auth/ThriftClient.java | 12 +-
.../storm/security/auth/ThriftServer.java | 10 +-
.../authorizer/DRPCSimpleACLAuthorizer.java | 6 +-
.../authorizer/ImpersonationAuthorizer.java | 8 +-
.../auth/authorizer/SimpleACLAuthorizer.java | 6 +-
.../SupervisorSimpleACLAuthorizer.java | 6 +-
.../auth/digest/DigestSaslTransportPlugin.java | 20 +-
.../auth/digest/JassPasswordProvider.java | 6 +-
.../storm/security/auth/kerberos/AutoTGT.java | 12 +-
.../auth/kerberos/AutoTGTKrb5LoginModule.java | 4 +-
.../auth/kerberos/ClientCallbackHandler.java | 6 +-
.../kerberos/KerberosSaslTransportPlugin.java | 36 +-
.../security/auth/kerberos/NoOpTTrasport.java | 6 +-
.../auth/kerberos/ServerCallbackHandler.java | 6 +-
.../auth/plain/PlainSaslTransportPlugin.java | 16 +-
.../security/auth/sasl/SaslTransportPlugin.java | 24 +-
.../auth/workertoken/WorkerTokenAuthorizer.java | 12 +-
.../WorkerTokenClientCallbackHandler.java | 4 +-
.../serialization/BlowfishTupleSerializer.java | 5 +-
.../GzipThriftSerializationDelegate.java | 8 +-
.../ThriftSerializationDelegate.java | 8 +-
.../jvm/org/apache/storm/spout/ShellSpout.java | 2 +-
.../storm/state/BaseBinaryStateIterator.java | 4 +-
.../apache/storm/state/BaseStateIterator.java | 4 +-
.../apache/storm/stats/BoltExecutorStats.java | 2 +-
.../jvm/org/apache/storm/stats/StatsUtil.java | 2 +-
.../src/jvm/org/apache/storm/streams/Node.java | 6 +-
.../org/apache/storm/streams/ProcessorBolt.java | 4 +-
.../storm/streams/ProcessorBoltDelegate.java | 14 +-
.../storm/streams/StatefulProcessorBolt.java | 4 +-
.../org/apache/storm/streams/StreamBuilder.java | 12 +-
.../org/apache/storm/streams/StreamUtil.java | 2 +-
.../storm/streams/StreamsEdgeFactory.java | 2 +-
.../storm/streams/WindowedProcessorBolt.java | 4 +-
.../processors/CoGroupByKeyProcessor.java | 4 +-
.../processors/ForwardingProcessorContext.java | 2 +-
.../storm/streams/processors/JoinProcessor.java | 4 +-
.../storm/task/GeneralTopologyContext.java | 6 +-
.../jvm/org/apache/storm/task/ShellBolt.java | 2 +-
.../org/apache/storm/task/TopologyContext.java | 4 +-
.../jvm/org/apache/storm/testing/TmpPath.java | 2 +-
.../storm/topology/ConfigurableTopology.java | 7 +-
.../apache/storm/topology/TopologyBuilder.java | 2 +-
.../state/TestTransactionalState.java | 6 +-
.../transactional/state/TransactionalState.java | 12 +-
.../apache/storm/trident/TridentTopology.java | 10 +-
.../trident/drpc/ReturnResultsReducer.java | 11 +-
.../storm/trident/graph/GraphGrouper.java | 3 +-
.../org/apache/storm/trident/graph/Group.java | 2 +-
.../trident/operation/impl/ChainedResult.java | 2 +-
.../org/apache/storm/trident/planner/Node.java | 5 +-
.../storm/trident/planner/SubtopologyBolt.java | 9 +-
.../state/JSONNonTransactionalSerializer.java | 5 +-
.../trident/state/JSONOpaqueSerializer.java | 4 +-
.../state/JSONTransactionalSerializer.java | 4 +-
.../apache/storm/trident/state/OpaqueValue.java | 2 +-
.../storm/trident/state/TransactionalValue.java | 3 +-
.../storm/trident/testing/TuplifyArgs.java | 4 +-
.../trident/topology/TridentBoltExecutor.java | 2 +-
.../topology/TridentTopologyBuilder.java | 4 +-
.../state/RotatingTransactionalState.java | 2 +-
.../topology/state/TestTransactionalState.java | 6 +-
.../topology/state/TransactionalState.java | 16 +-
.../apache/storm/trident/tuple/ComboList.java | 3 +-
.../storm/trident/tuple/ValuePointer.java | 2 +-
.../storm/trident/util/ErrorEdgeFactory.java | 2 +-
.../apache/storm/trident/util/TridentUtils.java | 4 +-
.../windowing/AbstractTridentWindowManager.java | 2 +-
.../trident/windowing/WindowsStateUpdater.java | 4 +-
.../storm/trident/windowing/WindowsStore.java | 2 +-
.../jvm/org/apache/storm/utils/ConfigUtils.java | 3 +-
.../org/apache/storm/utils/CuratorUtils.java | 16 +-
.../jvm/org/apache/storm/utils/DRPCClient.java | 4 +-
.../src/jvm/org/apache/storm/utils/JCQueue.java | 22 +-
.../jvm/org/apache/storm/utils/LocalState.java | 8 +-
.../org/apache/storm/utils/NimbusClient.java | 6 +-
.../StormBoundedExponentialBackoffRetry.java | 2 +-
.../apache/storm/utils/SupervisorClient.java | 2 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 37 +-
.../org/apache/storm/utils/VersionedStore.java | 2 +-
.../storm/utils/ZookeeperServerCnxnFactory.java | 77 -
.../storm/windowing/TimeTriggerPolicy.java | 2 +-
.../storm/windowing/TupleWindowIterImpl.java | 2 +-
.../windowing/WaterMarkEventGenerator.java | 2 +-
.../apache/storm/windowing/WindowManager.java | 2 +-
.../windowing/persistence/WindowState.java | 2 +-
.../apache/storm/zookeeper/ClientZookeeper.java | 36 +-
.../apache/storm/zookeeper/ZkEventTypes.java | 2 +-
.../apache/storm/zookeeper/ZkKeeperStates.java | 2 +-
.../org/apache/storm/TestConfigValidate.java | 4 +-
.../LocalAssignmentsBackendTest.java | 3 +-
.../apache/storm/cluster/DaemonTypeTest.java | 6 +-
.../DependencyPropertiesParserTest.java | 2 +-
.../dependency/DependencyUploaderTest.java | 4 +-
.../grouping/LoadAwareShuffleGroupingTest.java | 6 +-
.../storm/grouping/ShuffleGroupingTest.java | 2 +-
.../PartialKeyGroupingTest.java | 2 +-
.../RandomTwoTaskAssignmentCreatorTest.java | 2 +-
.../metric/filter/FilterByMetricNameTest.java | 4 +-
.../metric/util/DataPointExpanderTest.java | 2 +-
.../storm/security/auth/AuthUtilsTest.java | 230 -
.../storm/security/auth/AuthUtilsTestMock.java | 15 -
.../apache/storm/security/auth/AutoSSLTest.java | 2 +-
.../security/auth/ClientAuthUtilsTest.java | 224 +
.../auth/DefaultHttpCredentialsPluginTest.java | 83 -
.../storm/security/auth/ReqContextTest.java | 2 +-
.../storm/security/auth/ThriftClientTest.java | 2 +-
.../authorizer/DRPCSimpleACLAuthorizerTest.java | 2 +-
.../BlowfishTupleSerializerTest.java | 4 +-
.../state/BaseBinaryStateIteratorTest.java | 2 +-
.../apache/storm/streams/ProcessorBoltTest.java | 6 +-
.../streams/StatefulProcessorBoltTest.java | 6 +-
.../streams/WindowedProcessorBoltTest.java | 6 +-
.../PersistentWindowedBoltExecutorTest.java | 2 +-
.../storm/topology/TopologyBuilderTest.java | 2 +-
.../apache/storm/utils/CuratorUtilsTest.java | 10 +-
.../storm/utils/ShellBoltMessageQueueTest.java | 2 +-
.../storm/utils/ThriftTopologyUtilsTest.java | 4 +-
.../jvm/org/apache/storm/utils/UtilsTest.java | 8 +-
.../utils/ZookeeperServerCnxnFactoryTest.java | 34 -
.../src/clj/org/apache/storm/thrift.clj | 2 +-
storm-core/pom.xml | 91 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 7 +-
.../test/clj/org/apache/storm/cluster_test.clj | 4 +-
.../storm/security/auth/nimbus_auth_test.clj | 2 +-
.../clj/org/apache/storm/transactional_test.clj | 4 +-
.../clj/org/apache/storm/trident/state_test.clj | 4 +-
storm-server/pom.xml | 46 +-
.../java/org/apache/storm/DaemonConfig.java | 14 +
.../ILocalClusterTrackedTopologyAware.java | 2 +-
.../java/org/apache/storm/LocalCluster.java | 4 +-
.../main/java/org/apache/storm/LocalDRPC.java | 2 +-
.../src/main/java/org/apache/storm/Testing.java | 2 +-
.../apache/storm/blobstore/BlobStoreUtils.java | 9 +-
.../storm/blobstore/FileBlobStoreImpl.java | 2 +-
.../storm/blobstore/KeySequenceNumber.java | 8 +-
.../storm/blobstore/LocalFsBlobStore.java | 13 +-
.../blobstore/LocalFsBlobStoreSynchronizer.java | 2 +-
.../java/org/apache/storm/daemon/drpc/DRPC.java | 2 +-
.../org/apache/storm/daemon/nimbus/Nimbus.java | 37 +-
.../storm/daemon/supervisor/BasicContainer.java | 4 +-
.../apache/storm/daemon/supervisor/Slot.java | 2 +-
.../storm/daemon/supervisor/Supervisor.java | 6 +-
.../timer/ReportWorkerHeartbeats.java | 2 +-
.../timer/SynchronizeAssignments.java | 2 +-
.../apache/storm/localizer/AsyncLocalizer.java | 6 +-
.../storm/localizer/LocalizedResource.java | 2 +-
.../LocalizedResourceRetentionSet.java | 3 +-
.../metricstore/NimbusMetricProcessor.java | 2 +-
.../storm/metricstore/rocksdb/RocksDbKey.java | 2 +-
.../storm/nimbus/LeaderListenerCallback.java | 12 +-
.../nimbus/NimbusHeartbeatsPressureTest.java | 4 +-
...WorkerHeartbeatsRecoveryStrategyFactory.java | 2 +-
.../org/apache/storm/pacemaker/Pacemaker.java | 2 +-
.../apache/storm/pacemaker/PacemakerServer.java | 18 +-
.../pacemaker/codec/ThriftNettyServerCodec.java | 10 +-
.../org/apache/storm/scheduler/Cluster.java | 2 +-
.../apache/storm/scheduler/EvenScheduler.java | 4 +-
.../scheduler/blacklist/BlacklistScheduler.java | 4 +-
.../resource/ResourceAwareScheduler.java | 2 +-
.../normalization/NormalizedResources.java | 2 +-
.../scheduling/BaseResourceAwareStrategy.java | 4 +-
.../scheduling/ConstraintSolverStrategy.java | 2 +-
.../auth/DefaultHttpCredentialsPlugin.java | 91 +
.../security/auth/IHttpCredentialsPlugin.java | 50 +
.../storm/security/auth/ServerAuthUtils.java | 62 +
.../auth/workertoken/WorkerTokenManager.java | 6 +-
.../storm/testing/InProcessZookeeper.java | 5 +-
.../org/apache/storm/utils/ServerUtils.java | 5 +-
.../storm/utils/ZookeeperServerCnxnFactory.java | 77 +
.../apache/storm/zookeeper/AclEnforcement.java | 12 +-
.../storm/zookeeper/LeaderElectorImp.java | 10 +-
.../org/apache/storm/zookeeper/Zookeeper.java | 16 +-
.../java/org/apache/storm/TestRebalance.java | 2 +-
.../LocalFsBlobStoreSynchronizerTest.java | 6 +-
.../blobstore/MockZookeeperClientBuilder.java | 10 +-
.../apache/storm/security/auth/AuthTest.java | 21 +-
.../auth/DefaultHttpCredentialsPluginTest.java | 83 +
.../security/auth/ServerAuthUtilsTest.java | 62 +
.../auth/workertoken/WorkerTokenTest.java | 6 +-
.../utils/ZookeeperServerCnxnFactoryTest.java | 33 +
.../apache/storm/daemon/drpc/DRPCServer.java | 6 +-
.../storm/daemon/drpc/webapp/DRPCResource.java | 2 +-
.../logviewer/utils/ResourceAuthorizer.java | 6 +-
.../logviewer/webapp/LogviewerApplication.java | 4 +-
397 files changed, 15393 insertions(+), 15181 deletions(-)
----------------------------------------------------------------------