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

This reverts commit b3d36fb5c7dcd498bb48c629c810a74161c139f3.

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:

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()

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])}

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')