Brutex
/
cavis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shutdown hook for UI server (#9005) 

* shutdown hook for UI server

Signed-off-by: Tamás Fenyvesi <tamas.fenyvesi@doknet.hu>

* logging exception

Signed-off-by: Tamás Fenyvesi <tamas.fenyvesi@doknet.hu>
master
Tamás Fenyvesi 2020-07-25 13:30:49 +02:00 committed by GitHub
parent a17a579b1f
commit f33b08e20f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/VertxUIServer.java
View File

@ -75,7 +75,8 @@ public class VertxUIServer extends AbstractVerticle implements UIServer {
private static Function<String, StatsStorage> statsStorageProvider;
private static Integer instancePort;
private static Thread autoStopThread;
@Getter
private static Thread shutdownHook;
/**
* Get (and, initialize if necessary) the UI server. This synchronous function will wait until the server started.
@ -188,19 +189,17 @@ public class VertxUIServer extends AbstractVerticle implements UIServer {
Vertx vertx = Vertx.vertx();
vertx.deployVerticle(VertxUIServer.class.getName(), promise);
Thread currentThread = Thread.currentThread();
VertxUIServer.autoStopThread = new Thread(() -> {
try {
currentThread.join();
if (VertxUIServer.instance != null && !VertxUIServer.instance.isStopped()) {
log.info("Deeplearning4j UI server is auto-stopping after thread (name: {}) died.",
currentThread.getName());
VertxUIServer.shutdownHook = new Thread(() -> {
if (VertxUIServer.instance != null && !VertxUIServer.instance.isStopped()) {
log.info("Deeplearning4j UI server is auto-stopping in shutdown hook.");
try {
instance.stop();
} catch (InterruptedException e) {
log.error("Interrupted stopping of Deeplearning4j UI server in shutdown hook.", e);
}
} catch (InterruptedException e) {
log.error("Deeplearning4j UI server auto-stop thread was interrupted.", e);
}
});
Runtime.getRuntime().addShutdownHook(shutdownHook);
}
@ -385,7 +384,6 @@ public class VertxUIServer extends AbstractVerticle implements UIServer {
+ server.actualPort(), result.cause()));
}
});
VertxUIServer.autoStopThread.start();
}
private List<String> extractArgsFromRoute(String path, RoutingContext rc) {

10
deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/api/UIServer.java
View File

@ -168,4 +168,14 @@ public interface UIServer {
* @param stopCallback callback {@link Promise} to notify on completion
*/
void stopAsync(Promise<Void> stopCallback);
/**
* Get shutdown hook of UI server, that will stop the server when the Runtime is stopped.
* You may de-register this shutdown hook with {@link Runtime#removeShutdownHook(Thread)},
* and add your own hook with {@link Runtime#addShutdownHook(Thread)}
* @return shutdown hook
*/
static Thread getShutdownHook() {
return VertxUIServer.getShutdownHook();
};
}

18
deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/test/java/org/deeplearning4j/ui/TestVertxUI.java
View File

@ -346,12 +346,16 @@ public class TestVertxUI extends BaseDL4JTest {
}
@Test
public void testUIAutoStopOnThreadExit() throws InterruptedException {
AtomicReference<UIServer> uiServer = new AtomicReference<>();
Thread thread = new Thread(() -> uiServer.set(UIServer.getInstance()));
thread.start();
thread.join();
Thread.sleep(1_000);
assertTrue(uiServer.get().isStopped());
public void testUIShutdownHook() throws InterruptedException {
UIServer uIServer = UIServer.getInstance();
Thread shutdownHook = UIServer.getShutdownHook();
shutdownHook.start();
shutdownHook.join();
/*
* running the shutdown hook thread before the Runtime is terminated
* enables us to check if the UI server has been shut down or not
*/
assertTrue(uIServer.isStopped());
log.info("Deeplearning4j UI server stopped in shutdown hook.");
}
}