Repository: ambari Updated Branches: refs/heads/trunk 0d926322f -> 532477127
AMBARI-17804. ATS goes down after deleting Smartsense and restarting services with stale configs (smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/53247712 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53247712 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53247712 Branch: refs/heads/trunk Commit: 5324771272e15a7178ffef52e2dc70c4c2fbb4d3 Parents: 0d92632 Author: Sumit Mohanty <[email protected]> Authored: Wed Jul 20 11:25:47 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Wed Jul 20 11:47:48 2016 -0700 ---------------------------------------------------------------------- .../HDP/2.3/services/YARN/configuration/yarn-site.xml | 9 +++++++++ .../main/resources/stacks/HDP/2.5/services/stack_advisor.py | 8 ++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/53247712/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml index 68f0e04..5daa9fd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml @@ -98,6 +98,15 @@ </value-attributes> <on-ambari-upgrade add="true"/> </property> + <property> + <name>yarn.timeline-service.entity-group-fs-store.group-id-plugin-classpath</name> + <value/> + <description>Classpath for all plugins defined in yarn.timeline-service.entity-group-fs-store.group-id-plugin-classes.</description> + <value-attributes> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> <!-- advanced ats v1.5 properties--> <property> <name>yarn.timeline-service.entity-group-fs-store.summary-store</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/53247712/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 616516e..315020b 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 @@ -563,10 +563,10 @@ class HDP25StackAdvisor(HDP24StackAdvisor): timeline_plugin_classes_values = [] timeline_plugin_classpath_values = [] - if "tez-site" in services["configurations"]: + if self.__isServiceDeployed(services, "TEZ"): timeline_plugin_classes_values.append('org.apache.tez.dag.history.logging.ats.TimelineCachePluginImpl') - if "spark-defaults" in services["configurations"]: + if self.__isServiceDeployed(services, "SPARK"): timeline_plugin_classes_values.append('org.apache.spark.deploy.history.yarn.plugin.SparkATSPlugin') timeline_plugin_classpath_values.append(stack_root + "/${hdp.version}/spark/hdpLib/*") @@ -1758,6 +1758,10 @@ class HDP25StackAdvisor(HDP24StackAdvisor): return self.toConfigurationValidationProblems(validationItems, "ranger-admin-site") + def __isServiceDeployed(self, services, serviceName): + servicesList = [service["StackServices"]["service_name"] for service in services["services"]] + return serviceName in servicesList + """ Returns the host(s) on which a requested service's component is hosted. Parameters :
