Repository: ambari
Updated Branches:
  refs/heads/trunk 05895dd43 -> 5577b4387


AMBARI-16411. Fix for Stack advisor warning while looking for non-existing 
'hive-interactive-site' when hive interactive is not installed/selected


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5577b438
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5577b438
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5577b438

Branch: refs/heads/trunk
Commit: 5577b4387972c263a4bf715ca17cde7f0cb09144
Parents: 05895dd
Author: Swapan Shridhar <sshrid...@hortonworks.com>
Authored: Mon May 9 16:38:36 2016 -0700
Committer: Swapan Shridhar <sshrid...@hortonworks.com>
Committed: Mon May 9 18:18:08 2016 -0700

----------------------------------------------------------------------
 .../src/main/resources/stacks/HDP/2.5/services/stack_advisor.py   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5577b438/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index b8c44d3..3d689d7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -169,7 +169,8 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
     else:
       putHiveInteractiveEnvProperty('enable_hive_interactive', 'false')
 
-    if 'hive.llap.zk.sm.connectionString' in 
services['configurations'][self.HIVE_INTERACTIVE_SITE]['properties']:
+    if self.HIVE_INTERACTIVE_SITE in services['configurations'] and \
+        'hive.llap.zk.sm.connectionString' in 
services['configurations'][self.HIVE_INTERACTIVE_SITE]['properties']:
       # Fill the property 'hive.llap.zk.sm.connectionString' required by Hive 
Server Interactive (HiveServer2)
       zookeeper_host_port = self.getZKHostPortString(services)
       if zookeeper_host_port:

Reply via email to