Change in asterixdb[master]: Move Shutdown Hook to NCDriver

[abdullah alamoudi (Code Review)]

abdullah alamoudi has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1326

Change subject: Move Shutdown Hook to NCDriver
......................................................................

Move Shutdown Hook to NCDriver

Change-Id: Iaef38818e195453eba120a46b5fa7d38b166fd70
---
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCDriver.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
2 files changed, 5 insertions(+), 7 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/26/1326/1

diff --git 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCDriver.java
 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCDriver.java
index cbd8edd..2323d71 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCDriver.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCDriver.java
@@ -39,12 +39,13 @@
                 System.exit(1);
             }
             ncConfig.loadConfigAndApplyDefaults();
-            final NodeControllerService nService = new 
NodeControllerService(ncConfig);
+            final NodeControllerService ncService = new 
NodeControllerService(ncConfig);
             if (LOGGER.isLoggable(Level.SEVERE)) {
-                LOGGER.severe("Setting uncaught exception handler " + 
nService.getLifeCycleComponentManager());
+                LOGGER.severe("Setting uncaught exception handler " + 
ncService.getLifeCycleComponentManager());
             }
-            
Thread.currentThread().setUncaughtExceptionHandler(nService.getLifeCycleComponentManager());
-            nService.start();
+            
Thread.currentThread().setUncaughtExceptionHandler(ncService.getLifeCycleComponentManager());
+            ncService.start();
+            Runtime.getRuntime().addShutdownHook(new 
NCShutdownHook(ncService));
             while (true) {
                 Thread.sleep(10000);
             }
diff --git 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
index 540b4d0..9d4cfff 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
@@ -326,9 +326,6 @@
         if (ncAppEntryPoint != null) {
             ncAppEntryPoint.notifyStartupComplete();
         }
-
-        //add JVM shutdown hook
-        Runtime.getRuntime().addShutdownHook(new NCShutdownHook(this));
     }
 
     private void startApplication() throws Exception {

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1326
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaef38818e195453eba120a46b5fa7d38b166fd70
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <bamou...@gmail.com>