Repository: ambari Updated Branches: refs/heads/trunk aac9fe6e2 -> 344628314
AMBARI-21274: Typo in stack advisor error message for yarn and mr queue config issues (sangeetar) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34462831 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34462831 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34462831 Branch: refs/heads/trunk Commit: 34462831450c3f592b3343940c2c623f9bb7489b Parents: aac9fe6 Author: Sangeeta Ravindran <sangee...@apache.org> Authored: Wed Jun 28 09:16:48 2017 -0700 Committer: Sangeeta Ravindran <sangee...@apache.org> Committed: Wed Jun 28 09:16:48 2017 -0700 ---------------------------------------------------------------------- ambari-server/src/main/resources/stacks/stack_advisor.py | 2 +- .../src/test/python/stacks/2.0.6/common/test_stack_advisor.py | 2 +- .../src/test/python/stacks/2.5/common/test_stack_advisor.py | 2 +- .../src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/34462831/ambari-server/src/main/resources/stacks/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/stack_advisor.py b/ambari-server/src/main/resources/stacks/stack_advisor.py index 3a39a34..8e08d82 100644 --- a/ambari-server/src/main/resources/stacks/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/stack_advisor.py @@ -2752,7 +2752,7 @@ class DefaultStackAdvisor(StackAdvisor): if len(leaf_queue_names) == 0: return None elif queue_name not in leaf_queue_names: - return self.getErrorItem("Queue is not exist or not corresponds to existing YARN leaf queue") + return self.getErrorItem("Queue does not exist or correspond to an existing YARN leaf queue") return None http://git-wip-us.apache.org/repos/asf/ambari/blob/34462831/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py index b6f1965..0c4996b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py @@ -534,7 +534,7 @@ class TestHDP206StackAdvisor(TestCase): hosts = self.prepareHosts([]) result = self.stackAdvisor.validateConfigurations(services, hosts) expectedItems = [ - {'message': 'Queue is not exist or not corresponds to existing YARN leaf queue', 'level': 'ERROR'} + {'message': 'Queue does not exist or correspond to an existing YARN leaf queue', 'level': 'ERROR'} ] self.assertValidationResult(expectedItems, result) services["configurations"]["yarn-env"]["properties"]["service_check.queue.name"] = "ndfqueue" http://git-wip-us.apache.org/repos/asf/ambari/blob/34462831/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py index e62e00c..50f527d 100644 --- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py @@ -5334,7 +5334,7 @@ class TestHDP25StackAdvisor(TestCase): hosts = self.prepareHosts([]) result = self.stackAdvisor.validateConfigurations(services, hosts) expectedItems = [ - {'message': 'Queue is not exist or not corresponds to existing YARN leaf queue', 'level': 'ERROR'} + {'message': 'Queue does not exist or correspond to an existing YARN leaf queue', 'level': 'ERROR'} ] self.assertValidationResult(expectedItems, result) services["configurations"]["yarn-env"]["properties"]["service_check.queue.name"] = "ndfqueue2" http://git-wip-us.apache.org/repos/asf/ambari/blob/34462831/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py index 5a95fe3..5f70db2 100755 --- a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py +++ b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py @@ -1395,7 +1395,7 @@ class ODPi20StackAdvisor(DefaultStackAdvisor): if len(leaf_queue_names) == 0: return None elif queue_name not in leaf_queue_names: - return self.getErrorItem("Queue is not exist or not corresponds to existing YARN leaf queue") + return self.getErrorItem("Queue does not exist or correspond to an existing YARN leaf queue") return None