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/09/17 19:54:07 UTC
[6/6] storm git commit: Merge branch 'STORM-3197' of
https://github.com/srdo/storm into STORM-3197
Merge branch 'STORM-3197' of https://github.com/srdo/storm into STORM-3197
STORM-3197: Make StormMetricsRegistry non-static
This closes #2805
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/eaed3cbf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/eaed3cbf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/eaed3cbf
Branch: refs/heads/master
Commit: eaed3cbf3610bbefb9466f2c40db1e0e2a20ca9c
Parents: 37d22b8 8c90f12
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Sep 17 14:31:28 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Sep 17 14:31:28 2018 -0500
----------------------------------------------------------------------
.../storm/cassandra/trident/MapStateTest.java | 7 +-
pom.xml | 2 +-
.../jvm/org/apache/storm/utils/ShellUtils.java | 1 -
.../org/apache/storm/command/KillWorkers.java | 5 +-
.../apache/storm/trident/integration_test.clj | 18 +-
.../test/clj/org/apache/storm/drpc_test.clj | 20 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 21 +-
.../scheduler/multitenant_scheduler_test.clj | 38 ++--
.../clj/org/apache/storm/scheduler_test.clj | 3 +
.../java/org/apache/storm/LocalCluster.java | 21 +-
.../main/java/org/apache/storm/LocalDRPC.java | 14 +-
.../java/org/apache/storm/daemon/drpc/DRPC.java | 22 +-
.../reporters/ConsolePreparableReporter.java | 3 +-
.../reporters/CsvPreparableReporter.java | 3 +-
.../reporters/JmxPreparableReporter.java | 2 +-
.../metrics/reporters/PreparableReporter.java | 4 +-
.../org/apache/storm/daemon/nimbus/Nimbus.java | 227 ++++++++++++-------
.../storm/daemon/supervisor/BasicContainer.java | 22 +-
.../supervisor/BasicContainerLauncher.java | 15 +-
.../storm/daemon/supervisor/Container.java | 154 +++++--------
.../daemon/supervisor/ContainerLauncher.java | 14 +-
.../supervisor/ContainerMemoryTracker.java | 160 +++++++++++++
.../storm/daemon/supervisor/LocalContainer.java | 7 +-
.../supervisor/LocalContainerLauncher.java | 11 +-
.../daemon/supervisor/ReadClusterState.java | 7 +-
.../daemon/supervisor/RunAsUserContainer.java | 15 +-
.../supervisor/RunAsUserContainerLauncher.java | 16 +-
.../apache/storm/daemon/supervisor/Slot.java | 64 +++---
.../storm/daemon/supervisor/SlotMetrics.java | 46 ++++
.../storm/daemon/supervisor/Supervisor.java | 44 +++-
.../apache/storm/localizer/AsyncLocalizer.java | 36 +--
.../storm/localizer/LocalizedResource.java | 5 +-
.../storm/localizer/LocallyCachedBlob.java | 7 +-
.../localizer/LocallyCachedTopologyBlob.java | 9 +-
.../storm/metric/StormMetricsRegistry.java | 104 +++------
.../apache/storm/metricstore/MetricStore.java | 4 +-
.../storm/metricstore/MetricStoreConfig.java | 6 +-
.../metricstore/rocksdb/MetricsCleaner.java | 12 +-
.../storm/metricstore/rocksdb/RocksDbStore.java | 8 +-
.../storm/nimbus/LeaderListenerCallback.java | 10 +-
.../org/apache/storm/pacemaker/Pacemaker.java | 29 ++-
.../org/apache/storm/scheduler/Cluster.java | 17 +-
.../storm/scheduler/SupervisorDetails.java | 1 +
.../apache/storm/scheduler/TopologyDetails.java | 2 -
.../scheduler/blacklist/BlacklistScheduler.java | 6 +-
.../strategies/RasBlacklistStrategy.java | 4 +-
.../storm/scheduler/resource/RAS_Node.java | 2 +-
.../storm/scheduler/resource/ResourceUtils.java | 9 +-
.../normalization/NormalizedResourceOffer.java | 12 +-
.../NormalizedResourceRequest.java | 2 +-
.../normalization/NormalizedResources.java | 12 +-
.../resource/normalization/ResourceMetrics.java | 34 +++
.../scheduling/BaseResourceAwareStrategy.java | 13 +-
.../storm/zookeeper/LeaderElectorImp.java | 9 +-
.../org/apache/storm/zookeeper/Zookeeper.java | 14 +-
.../java/org/apache/storm/PacemakerTest.java | 12 +-
.../org/apache/storm/daemon/drpc/DRPCTest.java | 10 +-
.../daemon/supervisor/BasicContainerTest.java | 43 ++--
.../storm/daemon/supervisor/ContainerTest.java | 12 +-
.../storm/daemon/supervisor/SlotTest.java | 39 ++--
.../storm/localizer/AsyncLocalizerTest.java | 11 +-
.../LocalizedResourceRetentionSetTest.java | 14 +-
.../storm/metric/StormMetricsRegistryTest.java | 111 ---------
.../metricstore/rocksdb/RocksDbStoreTest.java | 5 +-
.../scheduler/blacklist/FaultGenerateUtils.java | 4 +-
.../blacklist/TestBlacklistScheduler.java | 66 +++---
.../resource/TestResourceAwareScheduler.java | 51 +++--
.../storm/scheduler/resource/TestUser.java | 5 +-
.../NormalizedResourceOfferTest.java | 5 +-
.../normalization/NormalizedResourcesTest.java | 9 +-
.../eviction/TestDefaultEvictionStrategy.java | 13 +-
.../TestFIFOSchedulingPriorityStrategy.java | 9 +-
.../TestConstraintSolverStrategy.java | 9 +-
.../TestDefaultResourceAwareStrategy.java | 10 +-
.../TestGenericResourceAwareStrategy.java | 9 +-
.../apache/storm/daemon/drpc/DRPCServer.java | 24 +-
.../daemon/drpc/webapp/DRPCApplication.java | 7 +-
.../storm/daemon/drpc/webapp/DRPCResource.java | 12 +-
.../storm/daemon/logviewer/LogviewerServer.java | 35 +--
.../handler/LogviewerLogDownloadHandler.java | 7 +-
.../handler/LogviewerLogPageHandler.java | 31 ++-
.../handler/LogviewerLogSearchHandler.java | 29 ++-
.../handler/LogviewerProfileHandler.java | 16 +-
.../logviewer/utils/DirectoryCleaner.java | 16 +-
.../logviewer/utils/ExceptionMeterNames.java | 60 +++++
.../daemon/logviewer/utils/ExceptionMeters.java | 66 ------
.../daemon/logviewer/utils/LogCleaner.java | 26 ++-
.../logviewer/utils/LogFileDownloader.java | 15 +-
.../utils/LogviewerResponseBuilder.java | 5 +-
.../daemon/logviewer/utils/WorkerLogs.java | 15 +-
.../logviewer/webapp/LogviewerApplication.java | 22 +-
.../logviewer/webapp/LogviewerResource.java | 76 ++++---
.../org/apache/storm/daemon/ui/UIServer.java | 36 +--
.../daemon/ui/filters/HeaderResponseFilter.java | 9 +-
.../ui/filters/HeaderResponseServletFilter.java | 11 +-
.../daemon/ui/resources/StormApiResource.java | 100 ++++----
.../storm/daemon/drpc/DRPCServerTest.java | 9 +-
.../handler/LogviewerLogPageHandlerTest.java | 4 +-
.../handler/LogviewerLogSearchHandlerTest.java | 7 +-
.../daemon/logviewer/utils/LogCleanerTest.java | 26 ++-
.../daemon/logviewer/utils/WorkerLogsTest.java | 3 +-
101 files changed, 1434 insertions(+), 1033 deletions(-)
----------------------------------------------------------------------