Repository: ambari Updated Branches: refs/heads/branch-2.4 100c805f8 -> e406be181
AMBARI-18044. Storm service check failed during EU due to empty value of storm.topology.submission.notifier.plugin.class config Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e406be18 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e406be18 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e406be18 Branch: refs/heads/branch-2.4 Commit: e406be18188f52af992ae5f9332faf4937398623 Parents: 100c805 Author: Sumit Mohanty <[email protected]> Authored: Fri Aug 5 16:56:16 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri Aug 5 16:56:16 2016 -0700 ---------------------------------------------------------------------- .../HDP/2.3/services/STORM/configuration/storm-site.xml | 2 +- .../main/resources/stacks/HDP/2.3/services/stack_advisor.py | 7 ++++--- .../src/test/python/stacks/2.3/common/test_stack_advisor.py | 3 +-- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e406be18/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml index 62d0fb2..b71f4a9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml @@ -68,6 +68,6 @@ <name>atlas.authentication.method</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/e406be18/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py index 9d75cee..9a099c6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py @@ -730,10 +730,11 @@ class HDP23StackAdvisor(HDP22StackAdvisor): application_classes = [item for item in notifier_plugin_value.split(",") if item != atlas_hook_class and item != " "] notifier_plugin_value = ",".join(application_classes) if application_classes else " " - if notifier_plugin_value != " " or \ - (not atlas_is_present and atlas_hook_is_set): - + if notifier_plugin_value.strip() != "": putStormStartupProperty(notifier_plugin_property, notifier_plugin_value) + else: + putStormStartupPropertyAttribute = self.putPropertyAttribute(configurations, "storm-site") + putStormStartupPropertyAttribute(notifier_plugin_property, 'delete', 'true') def getServiceConfigurationValidators(self): parentValidators = super(HDP23StackAdvisor, self).getServiceConfigurationValidators() http://git-wip-us.apache.org/repos/asf/ambari/blob/e406be18/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py index 137fd47..97a29b0 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py @@ -1778,9 +1778,8 @@ class TestHDP23StackAdvisor(TestCase): services["services"] = [] services["configurations"]["storm-site"]["properties"]["storm.topology.submission.notifier.plugin.class"] = "org.apache.atlas.storm.hook.StormAtlasHook" - expected["storm-site"]["properties"]["storm.topology.submission.notifier.plugin.class"] = " " self.stackAdvisor.recommendStormConfigurations(configurations, clusterData, services, hosts) - self.assertEquals(configurations, expected) + self.assertEquals(True, "storm.topology.submission.notifier.plugin.class" in configurations["storm-site"]["property_attributes"]) def test_recommendSqoopConfigurations(self): self.maxDiff = None
