AMBARI-7048. Change component message from "cannot" to "should not"
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f23e09de Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f23e09de Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f23e09de Branch: refs/heads/branch-alerts-dev Commit: f23e09de6c9aad0523c3fa77e2eaf7bfda72a5cc Parents: 966fff4 Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Wed Aug 27 14:38:06 2014 -0700 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Wed Aug 27 14:38:06 2014 -0700 ---------------------------------------------------------------------- .../main/resources/stacks/HDP/1.3.2/services/stack_advisor.py | 4 ++-- .../main/resources/stacks/HDP/2.0.6/services/stack_advisor.py | 4 ++-- .../src/test/python/stacks/2.0.6/common/test_stack_advisor.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f23e09de/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/stack_advisor.py index f3c1e1d..17a26e2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/stack_advisor.py @@ -192,8 +192,8 @@ class HDP132StackAdvisor(StackAdvisor): secondaryNameNodeHosts = secondaryNameNodeHosts[0] commonHosts = list(set(nameNodeHosts).intersection(secondaryNameNodeHosts)) for host in commonHosts: - items.append( { "type": 'host-component', "level": 'WARN', "message": 'NameNode and Secondary NameNode cannot be hosted on same machine', "component-name": 'NAMENODE', "host": str(host) } ) - items.append( { "type": 'host-component', "level": 'WARN', "message": 'NameNode and Secondary NameNode cannot be hosted on same machine', "component-name": 'SECONDARY_NAMENODE', "host": str(host) } ) + items.append( { "type": 'host-component', "level": 'WARN', "message": 'NameNode and Secondary NameNode should not be hosted on same machine', "component-name": 'NAMENODE', "host": str(host) } ) + items.append( { "type": 'host-component', "level": 'WARN', "message": 'NameNode and Secondary NameNode should not be hosted on same machine', "component-name": 'SECONDARY_NAMENODE', "host": str(host) } ) # Validating cardinality for component in componentsList: http://git-wip-us.apache.org/repos/asf/ambari/blob/f23e09de/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py index 083286e..4eb8f02 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py @@ -192,8 +192,8 @@ class HDP206StackAdvisor(StackAdvisor): secondaryNameNodeHosts = secondaryNameNodeHosts[0] commonHosts = list(set(nameNodeHosts).intersection(secondaryNameNodeHosts)) for host in commonHosts: - items.append( { "type": 'host-component', "level": 'WARN', "message": 'NameNode and Secondary NameNode cannot be hosted on same machine', "component-name": 'NAMENODE', "host": str(host) } ) - items.append( { "type": 'host-component', "level": 'WARN', "message": 'NameNode and Secondary NameNode cannot be hosted on same machine', "component-name": 'SECONDARY_NAMENODE', "host": str(host) } ) + items.append( { "type": 'host-component', "level": 'WARN', "message": 'NameNode and Secondary NameNode should not be hosted on same machine', "component-name": 'NAMENODE', "host": str(host) } ) + items.append( { "type": 'host-component', "level": 'WARN', "message": 'NameNode and Secondary NameNode should not be hosted on same machine', "component-name": 'SECONDARY_NAMENODE', "host": str(host) } ) # Validating cardinality for component in componentsList: http://git-wip-us.apache.org/repos/asf/ambari/blob/f23e09de/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 898797a..b1b9f7a 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 @@ -99,8 +99,8 @@ class TestHDP206StackAdvisor(TestCase): result = self.stackAdvisor.validateComponentLayout(services, hosts) expectedItems = [ - {"message": "NameNode and Secondary NameNode cannot be hosted on same machine", "level": "WARN", "host": "host1"}, - {"message": "NameNode and Secondary NameNode cannot be hosted on same machine", "level": "WARN", "host": "host1"}, + {"message": "NameNode and Secondary NameNode should not be hosted on same machine", "level": "WARN", "host": "host1"}, + {"message": "NameNode and Secondary NameNode should not be hosted on same machine", "level": "WARN", "host": "host1"}, {"message": "Host is not used", "level": "ERROR", "host": "host2"} ] self.assertValidationResult(expectedItems, result)