ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [2/3] ambari git commit: Revert "AMBARI-13227. Debian 7. Host check does not show warning about THP enabled on hosts. (aonishuk)"
Date Thu, 01 Oct 2015 11:44:08 GMT
Revert "AMBARI-13227. Debian 7. Host check does not show warning about THP enabled on hosts.
(aonishuk)"

This reverts commit b3d36fb5c7dcd498bb48c629c810a74161c139f3.


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

Branch: refs/heads/trunk
Commit: abf1cb84757d0f6132a7db59ea24a3c5a80f3f50
Parents: c538a4d
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Wed Sep 30 20:18:55 2015 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Thu Oct 1 14:43:57 2015 +0300

----------------------------------------------------------------------
 .../src/main/python/ambari_agent/HostInfo.py    | 14 ++++---------
 .../test/python/ambari_agent/TestHostInfo.py    | 22 --------------------
 .../custom_actions/scripts/check_host.py        | 13 ++++--------
 .../test/python/custom_actions/TestCheckHost.py |  1 -
 4 files changed, 8 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/abf1cb84/ambari-agent/src/main/python/ambari_agent/HostInfo.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/HostInfo.py b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
index 49f8417..3d7125a 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
@@ -157,8 +157,7 @@ class HostInfoLinux(HostInfo):
   DEFAULT_SERVICE_NAME = "ntpd"
   SERVICE_STATUS_CMD = "%s %s status" % (SERVICE_CMD, DEFAULT_SERVICE_NAME)
 
-  THP_FILE_REDHAT = "/sys/kernel/mm/redhat_transparent_hugepage/enabled"
-  THP_FILE_UBUNTU = "/sys/kernel/mm/transparent_hugepage/enabled"
+  THP_FILE = "/sys/kernel/mm/redhat_transparent_hugepage/enabled"
 
   def __init__(self, config=None):
     super(HostInfoLinux, self).__init__(config)
@@ -217,15 +216,10 @@ class HostInfoLinux(HostInfo):
     pass
 
   def getTransparentHugePage(self):
+    # This file exist only on redhat 6
     thp_regex = "\[(.+)\]"
-    file_name = None
-    if OSCheck.is_ubuntu_family():
-      file_name = self.THP_FILE_UBUNTU
-    elif OSCheck.is_redhat_family():
-      file_name = self.THP_FILE_REDHAT
-
-    if file_name:
-      with open(file_name) as f:
+    if os.path.isfile(self.THP_FILE):
+      with open(self.THP_FILE) as f:
         file_content = f.read()
         return re.search(thp_regex, file_content).groups()[0]
     else:

http://git-wip-us.apache.org/repos/asf/ambari/blob/abf1cb84/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
index a982f5f..57e4224 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
@@ -537,27 +537,5 @@ class TestHostInfo(TestCase):
     os_path_isfile_mock.return_value = False
     self.assertEqual("", hostInfo.getTransparentHugePage())
 
-  @patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = ('debian','7','Final')))
-  @patch("os.path.isfile")
-  @patch('__builtin__.open')
-  def test_transparent_huge_page_debian(self, open_mock, os_path_isfile_mock):
-    context_manager_mock = MagicMock()
-    open_mock.return_value = context_manager_mock
-    file_mock = MagicMock()
-    file_mock.read.return_value = "[never] always"
-    enter_mock = MagicMock()
-    enter_mock.return_value = file_mock
-    exit_mock  = MagicMock()
-    setattr( context_manager_mock, '__enter__', enter_mock )
-    setattr( context_manager_mock, '__exit__', exit_mock )
-
-    hostInfo = HostInfoLinux()
-
-    os_path_isfile_mock.return_value = True
-    self.assertEqual("never", hostInfo.getTransparentHugePage())
-
-    os_path_isfile_mock.return_value = False
-    self.assertEqual("", hostInfo.getTransparentHugePage())
-
 if __name__ == "__main__":
   unittest.main()

http://git-wip-us.apache.org/repos/asf/ambari/blob/abf1cb84/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
index 9aa3afb..a1c93b1 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
@@ -69,8 +69,7 @@ JARS_PATH_IN_ARCHIVE_SQLA = "/sqla-client-jdbc/java"
 LIBS_PATH_IN_ARCHIVE_SQLA = "/sqla-client-jdbc/native/lib64"
 JDBC_DRIVER_SQLA_JAR_PATH_IN_ARCHIVE = "/sqla-client-jdbc/java/" + JDBC_DRIVER_SQLA_JAR
 
-THP_FILE_REDHAT = "/sys/kernel/mm/redhat_transparent_hugepage/enabled"
-THP_FILE_UBUNTU = "/sys/kernel/mm/transparent_hugepage/enabled"
+THP_FILE = "/sys/kernel/mm/redhat_transparent_hugepage/enabled"
 
 class CheckHost(Script):
   # Packages that are used to find repos (then repos are used to find other packages)
@@ -166,14 +165,10 @@ class CheckHost(Script):
     # Here we are checking transparent huge page if CHECK_TRANSPARENT_HUGE_PAGE is in check_execute_list
     if CHECK_TRANSPARENT_HUGE_PAGE in check_execute_list:
       try :
+        # This file exist only on redhat 6
         thp_regex = "\[(.+)\]"
-        file_name = None
-        if OSCheck.is_ubuntu_family():
-          file_name = THP_FILE_UBUNTU
-        elif OSCheck.is_redhat_family():
-          file_name = THP_FILE_REDHAT
-        if os.path.isfile(file_name):
-          with open(file_name) as f:
+        if os.path.isfile(THP_FILE):
+          with open(THP_FILE) as f:
             file_content = f.read()
             structured_output[CHECK_TRANSPARENT_HUGE_PAGE] = {"exit_code" : 0, "message":
str(re.search(thp_regex,
                                                                                         
   file_content).groups()[0])}

http://git-wip-us.apache.org/repos/asf/ambari/blob/abf1cb84/ambari-server/src/test/python/custom_actions/TestCheckHost.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/custom_actions/TestCheckHost.py b/ambari-server/src/test/python/custom_actions/TestCheckHost.py
index 1e45927..b21254a 100644
--- a/ambari-server/src/test/python/custom_actions/TestCheckHost.py
+++ b/ambari-server/src/test/python/custom_actions/TestCheckHost.py
@@ -344,7 +344,6 @@ class TestCheckHost(TestCase):
     pass
 
 
-  @patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = ('debian','7','Final')))
   @patch.object(HostCheckReportFileHandler, "resolve_ambari_config")
   @patch("resource_management.libraries.script.Script.put_structured_out")
   @patch.object(Script, 'get_tmp_dir')


Mime
View raw message