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/28 18:07:42 UTC
[1/2] storm git commit: STORM-3236 mark shutdown meters before
stopping metric reporting
Repository: storm
Updated Branches:
refs/heads/master 53434b7eb -> c367f9af7
STORM-3236 mark shutdown meters before stopping metric reporting
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2b9f404c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2b9f404c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2b9f404c
Branch: refs/heads/master
Commit: 2b9f404cc29f1b46008cdf7ae0d2337dc905a47b
Parents: 4c3a9bd
Author: Aaron Gresch <ag...@yahoo-inc.com>
Authored: Wed Sep 26 16:37:03 2018 -0500
Committer: Aaron Gresch <ag...@yahoo-inc.com>
Committed: Wed Sep 26 16:37:03 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java | 4 +---
.../java/org/apache/storm/daemon/logviewer/LogviewerServer.java | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2b9f404c/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java
index 66653d1..9c24f06 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java
@@ -172,9 +172,6 @@ public class DRPCServer implements AutoCloseable {
@Override
public synchronized void close() {
if (!closed) {
- //This is kind of useless...
- meterShutdownCalls.mark();
-
if (handlerServer != null) {
handlerServer.stop();
}
@@ -229,6 +226,7 @@ public class DRPCServer implements AutoCloseable {
try (DRPCServer server = new DRPCServer(conf, metricsRegistry)) {
metricsRegistry.startMetricsReporters(conf);
Utils.addShutdownHookWithForceKillIn1Sec(() -> {
+ server.meterShutdownCalls.mark();
metricsRegistry.stopMetricsReporters();
server.close();
});
http://git-wip-us.apache.org/repos/asf/storm/blob/2b9f404c/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java
index 6eba28d..811f1ef 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java
@@ -145,9 +145,6 @@ public class LogviewerServer implements AutoCloseable {
@Override
public synchronized void close() {
if (!closed) {
- //This is kind of useless...
- meterShutdownCalls.mark();
-
//TODO this is causing issues...
//if (httpServer != null) {
// httpServer.destroy();
@@ -175,6 +172,7 @@ public class LogviewerServer implements AutoCloseable {
LogCleaner logCleaner = new LogCleaner(conf, workerLogs, directoryCleaner, logRootDir, metricsRegistry)) {
metricsRegistry.startMetricsReporters(conf);
Utils.addShutdownHookWithForceKillIn1Sec(() -> {
+ server.meterShutdownCalls.mark();
metricsRegistry.stopMetricsReporters();
server.close();
});
[2/2] storm git commit: Merge branch 'agresch_storm-3236' of
https://github.com/agresch/storm into STORM-3236
Posted by bo...@apache.org.
Merge branch 'agresch_storm-3236' of https://github.com/agresch/storm into STORM-3236
STORM-3236: mark shutdown meters before stopping metric reporting
This closes #2851
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c367f9af
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c367f9af
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c367f9af
Branch: refs/heads/master
Commit: c367f9af74669ae5a1f314b826fa9057cdfd546f
Parents: 53434b7 2b9f404
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Fri Sep 28 12:45:55 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Fri Sep 28 12:45:55 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java | 4 +---
.../java/org/apache/storm/daemon/logviewer/LogviewerServer.java | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------