AMBARI-23503: Fix installation issues caused by execution_command library (jluniya) (#925)

Change-Id: I46a1a09b20d651de2fea28b7e20f0f0d8be30a79

ambari-common/src/main/python/resource_management/libraries/execution_command/execution_command.py

@@ -49,6 +49,8 @@ class ExecutionCommand(object):
     value = self._execution_command
     try:
       for sub_key in sub_keys:
+        if not sub_key in value:
+          return default_value
         value = value[sub_key]
       return value
     except:
@@ -126,8 +128,8 @@ class ExecutionCommand(object):
   def get_mysql_jdbc_url(self):
     return self.__get_value('ambariLevelParams/mysql_jdbc_url')
 
-  def get_agent_stack_retry_count_on_unavailability(self):
-    return self.__get_value('ambariLevelParams/agent_stack_retry_count', 5)
+  def get_agent_stack_retry_count(self):
+    return int(self.__get_value('ambariLevelParams/agent_stack_retry_count', 5))
 
   def check_agent_stack_want_retry_on_unavailability(self):
     return self.__get_value('ambariLevelParams/agent_stack_retry_on_unavailability')

ambari-common/src/main/python/resource_management/libraries/execution_command/module_configs.py

@@ -31,12 +31,16 @@ class ModuleConfigs(object):
     self.__module_config_attributes = configAttributes
 
   def get_all_attributes(self, module_name, config_type):
+    if config_type not in self.__module_config_attributes:
+      return {}
     try:
       return self.__module_config_attributes[config_type]
     except:
       return {}
 
   def get_all_properties(self, module_name, config_type):
+    if config_type not in self.__module_configs:
+      return {}
     try:
       return self.__module_configs[config_type]
     except:
@@ -52,11 +56,10 @@ class ModuleConfigs(object):
     return properties
 
   def get_property_value(self, module_name, config_type, property_name, default=None):
+    if config_type not in self.__module_configs or property_name not in self.__module_configs[config_type]:
+      return default
     try:
-      if property_name:
-        return self.__module_configs[config_type][property_name]
-      else:
-        return self.__module_configs[config_type]
+      return self.__module_configs[config_type][property_name]
     except:
       return default
 

ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/params.py

@@ -44,7 +44,9 @@ host_sys_prepped = execution_command.is_host_system_prepared()
 
 sudo = AMBARI_SUDO_BINARY
 
-stack_version_formatted = execution_command.get_mpack_version() 
+stack_version_unformatted = execution_command.get_mpack_version()
+stack_version_formatted = format_stack_version(stack_version_unformatted)
+
 major_stack_version = get_major_version(stack_version_formatted)
 
 # service name
@@ -84,8 +86,8 @@ hadoop_heapsize = module_configs.get_property_value(module_name, 'hadoop-env', '
 namenode_heapsize = module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_heapsize')
 namenode_opt_newsize = module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_newsize')
 namenode_opt_maxnewsize = module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_maxnewsize')
-namenode_opt_permsize = format_jvm_option_value(module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_permsize', '128m'))
-namenode_opt_maxpermsize = format_jvm_option_value(module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_maxpermsize', '256m'))
+namenode_opt_permsize = format_jvm_option_value(module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_permsize', '128m'), '128m')
+namenode_opt_maxpermsize = format_jvm_option_value(module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_maxpermsize', '256m'), '256m')
 
 jtnode_opt_newsize = "200m"
 jtnode_opt_maxnewsize = "200m"

ambari-server/src/main/resources/stack-hooks/before-ANY/scripts/params.py

@@ -159,8 +159,8 @@ hadoop_heapsize = module_configs.get_property_value(module_name, 'hadoop-env', '
 namenode_heapsize = module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_heapsize')
 namenode_opt_newsize = module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_newsize')
 namenode_opt_maxnewsize = module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_maxnewsize')
-namenode_opt_permsize = format_jvm_option_value(module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_permsize', '128m'))
-namenode_opt_maxpermsize = format_jvm_option_value(module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_maxpermsize', '256m'))
+namenode_opt_permsize = format_jvm_option_value(module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_permsize', '128m'), '128m')
+namenode_opt_maxpermsize = format_jvm_option_value(module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_maxpermsize', '256m'), '256m')
 
 jtnode_opt_newsize = "200m"
 jtnode_opt_maxnewsize = "200m"

ambari-server/src/main/resources/stack-hooks/before-INSTALL/scripts/params.py

@@ -36,7 +36,7 @@ sudo = AMBARI_SUDO_BINARY
 
 stack_version_unformatted = execution_command.get_mpack_version()
 agent_stack_retry_on_unavailability = execution_command.check_agent_stack_want_retry_on_unavailability()
-agent_stack_retry_count = execution_command.get_agent_stack_retry_count_on_unavailability()
+agent_stack_retry_count = execution_command.get_agent_stack_retry_count()
 stack_version_formatted = format_stack_version(stack_version_unformatted)
 
 #users and groups

ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py

@@ -38,6 +38,7 @@ from resource_management.libraries.execution_command import module_configs
 from ambari_commons.constants import AMBARI_SUDO_BINARY
 from resource_management.libraries.functions.cluster_settings import get_cluster_setting_value
 
+config = Script.get_config()
 execution_command = Script.get_execution_command()
 module_configs = Script.get_module_configs()
 module_name = execution_command.get_module_name()
@@ -210,8 +211,8 @@ hadoop_heapsize = module_configs.get_property_value(module_name, 'hadoop-env', '
 namenode_heapsize = module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_heapsize')
 namenode_opt_newsize = module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_newsize')
 namenode_opt_maxnewsize = module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_maxnewsize')
-namenode_opt_permsize = format_jvm_option_value(module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_permsize', '128m'))
-namenode_opt_maxpermsize = format_jvm_option_value(module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_maxpermsize', '256m'))
+namenode_opt_permsize = format_jvm_option_value(module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_permsize', '128m'), '128m')
+namenode_opt_maxpermsize = format_jvm_option_value(module_configs.get_property_value(module_name, 'hadoop-env', 'namenode_opt_maxpermsize', '256m'), '256m')
 
 jtnode_opt_newsize = "200m"
 jtnode_opt_maxnewsize = "200m"