You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/09/30 19:17:14 UTC
ambari git commit: Revert "AMBARI-13227. Debian 7. Host check does
not show warning about THP enabled on hosts. (aonishuk)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 380481aeb -> 719bea42f
Revert "AMBARI-13227. Debian 7. Host check does not show warning about THP enabled on hosts. (aonishuk)"
This reverts commit 1a26fc5f13f09043b718980ab8ccbb6f9c3ff0c7.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/719bea42
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/719bea42
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/719bea42
Branch: refs/heads/branch-2.1
Commit: 719bea42f825fc36eef6b96dc1744ebf8e8b4153
Parents: 380481a
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Sep 30 20:16:38 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Sep 30 20:16:59 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/719bea42/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 c35ac76..e9d4110 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/719bea42/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 d9e4c9d..58745f9 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/719bea42/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 fbbac57..4d3cf76 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/719bea42/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 14cb8e3..ef08938 100644
--- a/ambari-server/src/test/python/custom_actions/TestCheckHost.py
+++ b/ambari-server/src/test/python/custom_actions/TestCheckHost.py
@@ -292,7 +292,6 @@ 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')