[hive] branch master updated: HIVE-21221 : Make HS2 and LLAP consistent - Bring up LLAP WebUI in test mode if WebUI port is configured (Oliver Draese via Deepak Jaiswal)

[djaiswal]

This is an automated email from the ASF dual-hosted git repository.

djaiswal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new aaf01ae  HIVE-21221 : Make HS2 and LLAP consistent - Bring up LLAP 
WebUI in test mode if WebUI port is configured (Oliver Draese via Deepak 
Jaiswal)
aaf01ae is described below

commit aaf01ae60bb987965a45adc243605e625fd39140
Author: Oliver Draese <odra...@cloudera.com>
AuthorDate: Fri Feb 15 14:36:39 2019 -0800

    HIVE-21221 : Make HS2 and LLAP consistent - Bring up LLAP WebUI in test 
mode if WebUI port is configured (Oliver Draese via Deepak Jaiswal)
---
 .../java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java 
b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java
index 41eca8f..bafa029 100644
--- 
a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java
+++ 
b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java
@@ -313,7 +313,11 @@ public class LlapDaemon extends CompositeService 
implements ContainerRunner, Lla
     // Not adding the registry as a service, since we need to control when it 
is initialized - conf used to pickup properties.
     this.registry = new LlapRegistryService(true);
 
-    if (HiveConf.getBoolVar(daemonConf, HiveConf.ConfVars.HIVE_IN_TEST)) {
+    // disable web UI in test mode until a specific port was configured
+    if (HiveConf.getBoolVar(daemonConf, HiveConf.ConfVars.HIVE_IN_TEST)
+        && Integer.parseInt(ConfVars.LLAP_DAEMON_WEB_PORT.getDefaultValue()) 
== webPort) {
+      LOG.info("Web UI was disabled in test mode because 
hive.llap.daemon.web.port was not "
+               + "specified or has default value ({})", webPort);
       this.webServices = null;
     } else {
       this.webServices = new LlapWebServices(webPort, this, registry);