ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject ambari git commit: AMBARI-13227. Debian 7. Host check does not show warning about THP enabled on hosts. (aonishuk)
Date Wed, 30 Sep 2015 12:59:00 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 0cf552c9c -> 1a26fc5f1


AMBARI-13227. Debian 7. Host check does not show warning about THP enabled on hosts. (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: 1a26fc5f13f09043b718980ab8ccbb6f9c3ff0c7
Parents: 0cf552c
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Wed Sep 30 15:58:10 2015 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Wed Sep 30 15:58:49 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, 42 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/ambari/blob/1a26fc5f/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 58745f9..d9e4c9d 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
@@ -537,5 +537,27 @@ 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/1a26fc5f/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 4d3cf76..fbbac57 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,7 +69,8 @@ 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 = "/sys/kernel/mm/redhat_transparent_hugepage/enabled"
+THP_FILE_REDHAT = "/sys/kernel/mm/redhat_transparent_hugepage/enabled"
+THP_FILE_UBUNTU = "/sys/kernel/mm/transparent_hugepage/enabled"
 
 class CheckHost(Script):
   # Packages that are used to find repos (then repos are used to find other packages)
@@ -165,10 +166,14 @@ 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 = "\[(.+)\]"
-        if os.path.isfile(THP_FILE):
-          with open(THP_FILE) as f:
+        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:
             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/1a26fc5f/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 ef08938..14cb8e3 100644
--- a/ambari-server/src/test/python/custom_actions/TestCheckHost.py
+++ b/ambari-server/src/test/python/custom_actions/TestCheckHost.py
@@ -292,6 +292,7 @@ class TestCheckHost(TestCase):
     put_structured_out_mock.assert_called_with({'last_agent_env_check': {'message': 'test
exception', 'exit_code': 1}})
 
 
+  @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