ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [20/45] git commit: Revert "AMBARI-7048. Change component message from "cannot" to "should not""
Date Thu, 28 Aug 2014 17:49:55 GMT
Revert "AMBARI-7048. Change component message from "cannot" to "should not""

This reverts commit f23e09de6c9aad0523c3fa77e2eaf7bfda72a5cc.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fc626c99
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fc626c99
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fc626c99

Branch: refs/heads/branch-alerts-dev
Commit: fc626c99cf579a37b1e1c8aad4690ceffc02c1e2
Parents: 9dcb434
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Wed Aug 27 16:00:26 2014 -0700
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Wed Aug 27 16:00:26 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/fc626c99/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 17a26e2..f3c1e1d 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 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) } )
+        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) } )
 
     # Validating cardinality
     for component in componentsList:

http://git-wip-us.apache.org/repos/asf/ambari/blob/fc626c99/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 4eb8f02..083286e 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 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) } )
+        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) } )
 
     # Validating cardinality
     for component in componentsList:

http://git-wip-us.apache.org/repos/asf/ambari/blob/fc626c99/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 71e329b..b8e0d58 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 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": "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": "Host is not used", "level": "ERROR", "host": "host2"}
     ]
     self.assertValidationResult(expectedItems, result)


Mime
View raw message