Change in asterixdb[stabilization-f69489]: [NO ISSUE][CONF] Make Starting Hyracks Console Configurable

[Murtadha Hubail (Code Review)]

Murtadha Hubail has uploaded this change for review. ( 
https://asterix-gerrit.ics.uci.edu/3415


Change subject: [NO ISSUE][CONF] Make Starting Hyracks Console Configurable
......................................................................

[NO ISSUE][CONF] Make Starting Hyracks Console Configurable

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
- Add a config option to allow starting or disabling the
  hyracks web console.

Change-Id: If0050b298431b150690959b6d35db69182777ff6
---
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java
2 files changed, 15 insertions(+), 4 deletions(-)



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

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 b5dacfb..5e99901 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
@@ -211,10 +211,12 @@
         clientIPC =
                 new IPCSystem(new 
InetSocketAddress(ccConfig.getClientListenAddress(), 
ccConfig.getClientListenPort()),
                         ciIPCI, new 
JavaSerializationBasedPayloadSerializerDeserializer());
-        webServer = new WebServer(this, ccConfig.getConsoleListenPort());
+        if (ccConfig.isStartWebConsole()) {
+            webServer = new WebServer(this, ccConfig.getConsoleListenPort());
+            webServer.start();
+        }
         clusterIPC.start();
         clientIPC.start();
-        webServer.start();
         info = new ClusterControllerInfo(ccId, 
ccConfig.getClientPublicAddress(), ccConfig.getClientPublicPort(),
                 ccConfig.getConsolePublicPort());
         timer.schedule(sweeper, 0, ccConfig.getDeadNodeSweepThreshold());
@@ -317,7 +319,9 @@
     public void stop() throws Exception {
         LOGGER.log(Level.INFO, "Stopping ClusterControllerService");
         stopApplication();
-        webServer.stop();
+        if (webServer != null) {
+            webServer.stop();
+        }
         sweeper.cancel();
         workQueue.stop();
         executor.shutdownNow();
diff --git 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java
 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java
index 57cf339..c2c967b 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java
@@ -74,7 +74,8 @@
         JOB_MANAGER_CLASS(STRING, 
"org.apache.hyracks.control.cc.job.JobManager"),
         ENFORCE_FRAME_WRITER_PROTOCOL(BOOLEAN, false),
         CORES_MULTIPLIER(INTEGER, 3),
-        CONTROLLER_ID(SHORT, (short) 0x0000);
+        CONTROLLER_ID(SHORT, (short) 0x0000),
+        START_WEB_CONSOLE(BOOLEAN, true);

         private final IOptionType parser;
         private Object defaultValue;
@@ -188,6 +189,8 @@
                             + "execution level";
                 case CONTROLLER_ID:
                     return "The 16-bit (0-65535) id of this Cluster 
Controller";
+                case START_WEB_CONSOLE:
+                    return "a flag indication if hyracks web console should be 
started";
                 default:
                     throw new IllegalStateException("NYI: " + this);
             }
@@ -434,4 +437,8 @@
     public CcId getCcId() {
         return CcId.valueOf(getAppConfig().getShort(Option.CONTROLLER_ID));
     }
+
+    public boolean isStartWebConsole() {
+        return getAppConfig().getBoolean(Option.START_WEB_CONSOLE);
+    }
 }

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

Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-f69489
Gerrit-MessageType: newchange
Gerrit-Change-Id: If0050b298431b150690959b6d35db69182777ff6
Gerrit-Change-Number: 3415
Gerrit-PatchSet: 1
Gerrit-Owner: Murtadha Hubail <mhub...@apache.org>