ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [1/2] ambari git commit: AMBARI-13170. One of the nodemanagers failed to start on Ubuntu14+secure+ranger cluster (aonishuk)
Date Tue, 22 Sep 2015 10:30:18 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 5c672809b -> d23228c78
  refs/heads/branch-2.1.2 d4653f289 -> 83aebc2c8


AMBARI-13170. One of the nodemanagers failed to start on Ubuntu14+secure+ranger cluster (aonishuk)


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

Branch: refs/heads/branch-2.1.2
Commit: 83aebc2c80de73cf3975303000f801dd5934ab75
Parents: d4653f2
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Tue Sep 22 13:30:00 2015 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Tue Sep 22 13:30:00 2015 +0300

----------------------------------------------------------------------
 .../test/python/resource_management/TestXmlConfigResource.py | 8 ++++----
 .../resource_management/libraries/providers/xml_config.py    | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/83aebc2c/ambari-agent/src/test/python/resource_management/TestXmlConfigResource.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/resource_management/TestXmlConfigResource.py b/ambari-agent/src/test/python/resource_management/TestXmlConfigResource.py
index 6092717..d9f75e3 100644
--- a/ambari-agent/src/test/python/resource_management/TestXmlConfigResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestXmlConfigResource.py
@@ -62,7 +62,7 @@ class TestXmlConfigResource(TestCase):
                 configuration_attributes={}
                 )
 
-    create_file_mock.assert_called_with('/dir/conf/file.xml', u'<!--Wed 2014-02-->\n
   <configuration>\n    \n  </configuration>', encoding='UTF-8')
+    create_file_mock.assert_called_with('/dir/conf/file.xml', u'  <configuration>\n
   \n  </configuration>', encoding='UTF-8')
 
 
   @patch("resource_management.core.providers.system._ensure_metadata")
@@ -91,7 +91,7 @@ class TestXmlConfigResource(TestCase):
                 configuration_attributes={'attr': {'property1': 'attr_value'}}
                 )
 
-    create_file_mock.assert_called_with('/dir/conf/file.xml', u'<!--Wed 2014-02-->\n
   <configuration>\n    \n    <property>\n      <name>property1</name>\n
     <value>value1</value>\n      <attr>attr_value</attr>\n    </property>\n
   \n  </configuration>', encoding='UTF-8')
+    create_file_mock.assert_called_with('/dir/conf/file.xml', u'  <configuration>\n
   \n    <property>\n      <name>property1</name>\n      <value>value1</value>\n
     <attr>attr_value</attr>\n    </property>\n    \n  </configuration>',
encoding='UTF-8')
 
 
   @patch("resource_management.core.providers.system._ensure_metadata")
@@ -144,7 +144,7 @@ class TestXmlConfigResource(TestCase):
                     }
                 })
 
-    create_file_mock.assert_called_with('/dir/conf/file.xml', u'<!--Wed 2014-02-->\n
   <configuration>\n    \n    <property>\n      <name></name>\n  
   <value></value>\n    </property>\n    \n    <property>\n      <name>prop.1</name>\n
     <value>&#39;.&#39;yyyy-MM-dd-HH</value>\n      <attr1>x</attr1>\n
   </property>\n    \n    <property>\n      <name>prop.2</name>\n
     <value>INFO, openjpa</value>\n    </property>\n    \n    <property>\n
     <name>prop.3</name>\n      <value>%d{ISO8601} %5p %c{1}:%L - %m%n</value>\n
     <attr2>value3</attr2>\n    </property>\n    \n    <property>\n
     <name>prop.4</name>\n      <value>${oozie.log.dir}/oozie.log</value>\n
     <attr_value_empty></attr_value_empty>\n      <attr2>value4</attr2>\n
   </property>\n    \n    <property>\n      <name>prop.empty</name>\n
     <value></value>\n      <attr_value_empty></attr_value_empty>\n
   </property>\n    \n  </configuration>', encoding='UTF-8')
+    create_file_mock.assert_called_with('/dir/conf/file.xml', u'  <configuration>\n
   \n    <property>\n      <name></name>\n      <value></value>\n
   </property>\n    \n    <property>\n      <name>prop.1</name>\n
     <value>&#39;.&#39;yyyy-MM-dd-HH</value>\n      <attr1>x</attr1>\n
   </property>\n    \n    <property>\n      <name>prop.2</name>\n
     <value>INFO, openjpa</value>\n    </property>\n    \n    <property>\n
     <name>prop.3</name>\n      <value>%d{ISO8601} %5p %c{1}:%L - %m%n</value>\n
     <attr2>value3</attr2>\n    </property>\n    \n    <property>\n
     <name>prop.4</name>\n      <value>${oozie.log.dir}/oozie.log</value>\n
     <attr_value_empty></attr_value_empty>\n      <attr2>value4</attr2>\n
   </property>\n    \n    <property>\n      <name>prop.empty</name>\n
     <value></value>\n      <attr_value_empty></attr_value_empty>\n
   </property>\n    \n  </configuration>', encoding='UTF-8')
 
   @patch("resource_management.core.providers.system._ensure_metadata")
   @patch.object(sudo, "create_file")
@@ -177,7 +177,7 @@ class TestXmlConfigResource(TestCase):
                 configuration_attributes={}
                 )
 
-    create_file_mock.assert_called_with('/dir/conf/file.xml', u'<!--Wed 2014-02-->\n
   <configuration>\n    \n    <property>\n      <name></name>\n  
   <value></value>\n    </property>\n    \n    <property>\n      <name>first</name>\n
     <value>should be first</value>\n    </property>\n    \n    <property>\n
     <name>second</name>\n      <value>should be second</value>\n
   </property>\n    \n    <property>\n      <name>third</name>\n 
    <value>should be third</value>\n    </property>\n    \n    <property>\n
     <name>z_last</name>\n      <value>should be last</value>\n  
 </property>\n    \n  </configuration>', encoding='UTF-8')
+    create_file_mock.assert_called_with('/dir/conf/file.xml', u'  <configuration>\n
   \n    <property>\n      <name></name>\n      <value></value>\n
   </property>\n    \n    <property>\n      <name>first</name>\n 
    <value>should be first</value>\n    </property>\n    \n    <property>\n
     <name>second</name>\n      <value>should be second</value>\n
   </property>\n    \n    <property>\n      <name>third</name>\n 
    <value>should be third</value>\n    </property>\n    \n    <property>\n
     <name>z_last</name>\n      <value>should be last</value>\n  
 </property>\n    \n  </configuration>', encoding='UTF-8')
 
   @patch("resource_management.libraries.providers.xml_config.File")
   @patch.object(sudo, "path_exists")

http://git-wip-us.apache.org/repos/asf/ambari/blob/83aebc2c/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
index 0fed503..887fc5f 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
@@ -36,8 +36,7 @@ class XmlConfigProvider(Provider):
     xml_config_provider_config_dir = self.resource.conf_dir
 
     # |e - for html-like escaping of <,>,',"
-    config_content = InlineTemplate('''<!--{{time.asctime(time.localtime())}}-->
-    <configuration>
+    config_content = InlineTemplate('''  <configuration>
     {% for key, value in configurations_dict|dictsort %}
     <property>
       <name>{{ key|e }}</name>


Mime
View raw message