[storm] branch master updated (7ea9235 -> b9fcb19)

[et...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ethanli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git.


    from 7ea9235  Merge pull request #3108 from RuiLi8080/STORM-3492
     add b9fcb19  STORM-3434: server: fix all checkstyle warnings (#3050)

No new revisions were added by this update.

Summary of changes:
 .../storm/scheduler/multitenant_scheduler_test.clj |  48 +--
 .../nimbus/InMemoryTopologyActionNotifier.java     |   2 +-
 storm-server/pom.xml                               |   2 +-
 .../main/java/org/apache/storm/DaemonConfig.java   |  41 +-
 .../storm/ILocalClusterTrackedTopologyAware.java   |   5 +-
 .../main/java/org/apache/storm/LocalCluster.java   |  68 ++--
 .../src/main/java/org/apache/storm/LocalDRPC.java  |   5 +-
 .../java/org/apache/storm/ProcessSimulator.java    |  15 +-
 .../src/main/java/org/apache/storm/Testing.java    | 221 +++++-----
 .../org/apache/storm/blobstore/BlobStoreUtils.java |   3 +-
 .../apache/storm/blobstore/FileBlobStoreImpl.java  |  26 +-
 .../apache/storm/blobstore/KeySequenceNumber.java  | 106 ++---
 .../apache/storm/blobstore/LocalFsBlobStore.java   |  77 ++--
 .../storm/blobstore/LocalFsBlobStoreFile.java      |  68 ++--
 .../container/ResourceIsolationInterface.java      |   3 +-
 .../daemon/drpc/BlockingOutstandingRequest.java    |  30 +-
 .../java/org/apache/storm/daemon/drpc/DRPC.java    |  39 +-
 .../org/apache/storm/daemon/drpc/DRPCThrift.java   |  15 +-
 .../storm/daemon/drpc/OutstandingRequest.java      |  24 +-
 .../apache/storm/daemon/drpc/RequestFactory.java   |   3 +-
 .../org/apache/storm/daemon/nimbus/Nimbus.java     | 443 +++++++++++----------
 .../org/apache/storm/daemon/nimbus/TopoCache.java  |   5 +-
 .../storm/daemon/nimbus/TopologyActions.java       |   2 +-
 .../storm/daemon/nimbus/TopologyResources.java     |   4 +
 .../daemon/nimbus/TopologyStateTransition.java     |   3 +-
 .../storm/daemon/supervisor/BasicContainer.java    | 340 ++++++++--------
 .../daemon/supervisor/BasicContainerLauncher.java  |  30 +-
 .../apache/storm/daemon/supervisor/Container.java  | 291 +++++++-------
 .../storm/daemon/supervisor/ContainerLauncher.java |   6 +-
 .../daemon/supervisor/ContainerMemoryTracker.java  |  13 +-
 .../apache/storm/daemon/supervisor/Killable.java   |   9 +-
 .../storm/daemon/supervisor/LocalContainer.java    |  20 +-
 .../daemon/supervisor/LocalContainerLauncher.java  |  20 +-
 .../daemon/supervisor/OnlyLatestExecutor.java      |   2 +-
 .../storm/daemon/supervisor/ReadClusterState.java  |  20 +-
 .../daemon/supervisor/RunAsUserContainer.java      |  14 +-
 .../supervisor/RunAsUserContainerLauncher.java     |  28 +-
 .../org/apache/storm/daemon/supervisor/Slot.java   |  85 ++--
 .../apache/storm/daemon/supervisor/Supervisor.java |   8 +-
 .../storm/daemon/supervisor/SupervisorUtils.java   |  21 +-
 .../org/apache/storm/localizer/AsyncLocalizer.java |  88 ++--
 .../storm/localizer/BlobChangingCallback.java      |   2 +-
 .../java/org/apache/storm/localizer/GoodToGo.java  |   1 +
 .../org/apache/storm/localizer/IOFunction.java     |   2 +
 .../apache/storm/localizer/LocalizedResource.java  |   2 +-
 .../localizer/LocalizedResourceRetentionSet.java   |   1 +
 .../storm/localizer/LocallyCachedTopologyBlob.java |  11 +-
 .../metric/ClusterMetricsConsumerExecutor.java     |  11 +-
 .../metric/LoggingClusterMetricsConsumer.java      |  18 +-
 .../metricstore/rocksdb/RocksDbMetricsWriter.java  |   6 +-
 .../storm/metricstore/rocksdb/RocksDbStore.java    |  15 +-
 .../metricstore/rocksdb/StringMetadataCache.java   |   4 +-
 .../rocksdb/WritableStringMetadataCache.java       |   4 +-
 .../nimbus/AssignmentDistributionService.java      |   1 -
 .../storm/nimbus/DefaultTopologyValidator.java     |   2 +-
 .../nimbus/ITopologyActionNotifierPlugin.java      |   8 +-
 .../apache/storm/nimbus/ITopologyValidator.java    |   2 +-
 .../storm/nimbus/LeaderListenerCallback.java       |   5 +-
 .../TimeOutWorkerHeartbeatsRecoveryStrategy.java   |   4 +-
 .../apache/storm/pacemaker/PacemakerServer.java    |  15 +-
 .../pacemaker/codec/ThriftNettyServerCodec.java    |  46 +--
 .../java/org/apache/storm/scheduler/Cluster.java   |   4 +-
 .../org/apache/storm/scheduler/ISupervisor.java    |   1 +
 .../apache/storm/scheduler/IsolationScheduler.java |   8 +-
 .../org/apache/storm/scheduler/Topologies.java     |   8 +-
 .../apache/storm/scheduler/TopologyDetails.java    |   3 +-
 .../scheduler/blacklist/BlacklistScheduler.java    |   6 +-
 .../blacklist/strategies/RasBlacklistStrategy.java |   2 +-
 .../storm/scheduler/multitenant/DefaultPool.java   |  97 +++--
 .../storm/scheduler/multitenant/FreePool.java      |  28 +-
 .../storm/scheduler/multitenant/IsolatedPool.java  | 146 ++++---
 .../apache/storm/scheduler/multitenant/Node.java   | 161 ++++----
 .../storm/scheduler/multitenant/NodePool.java      | 127 +++---
 .../resource/{RAS_Node.java => RasNode.java}       |  10 +-
 .../resource/{RAS_Nodes.java => RasNodes.java}     |  26 +-
 .../scheduler/resource/ResourceAwareScheduler.java |   2 +-
 .../DefaultSchedulingPriorityStrategy.java         |   4 +-
 .../priority/FIFOSchedulingPriorityStrategy.java   |   5 +-
 .../scheduling/BaseResourceAwareStrategy.java      |  50 +--
 .../scheduling/ConstraintSolverStrategy.java       |  46 +--
 .../scheduler/utils/ArtifactoryConfigLoader.java   |  35 +-
 .../auth/DefaultHttpCredentialsPlugin.java         |   2 +-
 .../security/auth/IHttpCredentialsPlugin.java      |   5 +-
 .../storm/security/auth/ServerAuthUtils.java       |   4 +-
 .../auth/workertoken/WorkerTokenManager.java       |   6 +-
 .../java/org/apache/storm/stats/StatsUtil.java     |  13 +-
 .../storm/testing/CompleteTopologyParam.java       |  10 +-
 .../apache/storm/testing/InProcessZookeeper.java   |   1 +
 .../java/org/apache/storm/testing/TestJob.java     |   2 +-
 .../org/apache/storm/testing/TrackedTopology.java  |  39 +-
 .../org/apache/storm/utils/ServerConfigUtils.java  |   8 +-
 .../java/org/apache/storm/utils/ServerUtils.java   |  81 ++--
 .../apache/storm/utils/StormCommonInstaller.java   |  10 +-
 .../storm/utils/ZookeeperServerCnxnFactory.java    |  35 +-
 .../org/apache/storm/zookeeper/AclEnforcement.java |   4 +-
 .../java/org/apache/storm/zookeeper/Zookeeper.java |  12 +-
 .../daemon/supervisor/BasicContainerTest.java      |   8 +-
 .../resource/TestResourceAwareScheduler.java       |   6 +-
 .../TestDefaultResourceAwareStrategy.java          |   6 +-
 99 files changed, 1756 insertions(+), 1678 deletions(-)
 rename storm-server/src/main/java/org/apache/storm/scheduler/resource/{RAS_Node.java => RasNode.java} (98%)
 rename storm-server/src/main/java/org/apache/storm/scheduler/resource/{RAS_Nodes.java => RasNodes.java} (89%)