asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ti...@apache.org
Subject incubator-asterixdb git commit: stop application entry point
Date Sat, 21 May 2016 01:28:33 GMT
Repository: incubator-asterixdb
Updated Branches:
  refs/heads/master fa51d4283 -> fbcf7e4aa


stop application entry point

Change-Id: Ia4a8fab765f4878b30b6f7adb430f01ef2757605
Reviewed-on: https://asterix-gerrit.ics.uci.edu/827
Reviewed-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Yingyi Bu <buyingyi@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/fbcf7e4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/fbcf7e4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/fbcf7e4a

Branch: refs/heads/master
Commit: fbcf7e4aa4afae415826614ab972bd2cf0823657
Parents: fa51d42
Author: Till Westmann <tillw@apache.org>
Authored: Fri May 20 07:44:37 2016 -0700
Committer: Till Westmann <tillw@apache.org>
Committed: Fri May 20 18:28:24 2016 -0700

----------------------------------------------------------------------
 .../control/cc/ClusterControllerService.java     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/fbcf7e4a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
index 8fb83d1..2aa3f37 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
@@ -249,10 +249,7 @@ public class ClusterControllerService implements IControllerService {
         workQueue.start();
         connectNCs();
         LOGGER.log(Level.INFO, "Started ClusterControllerService");
-        if (aep != null) {
-            // Sometimes, there is no application entry point. Check hyracks-client project
-            aep.startupCompleted();
-        }
+        notifyApplication();
     }
 
     private void startApplication() throws Exception {
@@ -288,9 +285,17 @@ public class ClusterControllerService implements IControllerService {
         }
     }
 
+    private void notifyApplication() throws Exception {
+        if (aep != null) {
+            // Sometimes, there is no application entry point. Check hyracks-client project
+            aep.startupCompleted();
+        }
+    }
+
     @Override
     public void stop() throws Exception {
         LOGGER.log(Level.INFO, "Stopping ClusterControllerService");
+        stopApplication();
         webServer.stop();
         sweeper.cancel();
         workQueue.stop();
@@ -301,6 +306,12 @@ public class ClusterControllerService implements IControllerService {
         LOGGER.log(Level.INFO, "Stopped ClusterControllerService");
     }
 
+    private void stopApplication() throws Exception {
+        if (aep != null) {
+            aep.stop();
+        }
+    }
+
     public ServerContext getServerContext() {
         return serverCtx;
     }


Mime
View raw message