You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by et...@apache.org on 2018/08/10 17:12:46 UTC
[3/3] storm git commit: Merge branch 'STORM-3133' of
https://github.com/zd-project/storm into STORM-3133
Merge branch 'STORM-3133' of https://github.com/zd-project/storm into STORM-3133
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/154173a7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/154173a7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/154173a7
Branch: refs/heads/master
Commit: 154173a70fb0e1b11c08be9b4499c811c30163f1
Parents: 16e5008 bf81b68
Author: Ethan Li <et...@gmail.com>
Authored: Fri Aug 10 12:11:56 2018 -0500
Committer: Ethan Li <et...@gmail.com>
Committed: Fri Aug 10 12:11:56 2018 -0500
----------------------------------------------------------------------
.../org/apache/storm/scheduler/WorkerSlot.java | 7 +
.../org/apache/storm/daemon/nimbus/Nimbus.java | 228 ++++++++++++-------
.../daemon/supervisor/SupervisorUtils.java | 9 +-
.../storm/localizer/LocallyCachedBlob.java | 3 +-
.../storm/metric/StormMetricsRegistry.java | 25 +-
.../storm/nimbus/LeaderListenerCallback.java | 7 +
.../org/apache/storm/scheduler/Cluster.java | 12 +-
.../apache/storm/scheduler/ExecutorDetails.java | 9 +-
.../storm/metric/StormMetricsRegistryTest.java | 111 +++++++++
.../storm/daemon/logviewer/LogviewerServer.java | 6 +-
.../handler/LogviewerLogPageHandler.java | 102 +++++----
.../handler/LogviewerLogSearchHandler.java | 159 ++++++++-----
.../daemon/logviewer/utils/DeletionMeta.java | 31 +++
.../logviewer/utils/DirectoryCleaner.java | 25 +-
.../daemon/logviewer/utils/ExceptionMeters.java | 66 ++++++
.../daemon/logviewer/utils/LogCleaner.java | 48 ++--
.../logviewer/utils/LogFileDownloader.java | 8 +
.../utils/LogviewerResponseBuilder.java | 19 +-
.../daemon/logviewer/utils/WorkerLogs.java | 16 +-
.../logviewer/webapp/LogviewerResource.java | 78 ++++++-
.../handler/LogviewerLogSearchHandlerTest.java | 3 +-
.../daemon/logviewer/utils/LogCleanerTest.java | 9 +-
22 files changed, 722 insertions(+), 259 deletions(-)
----------------------------------------------------------------------