ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: Revert "AMBARI-5973. Usability: Add checks for THP to the Ambari pre-req check for Linux (aonishuk)"
Date Tue, 03 Jun 2014 10:08:09 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 5eb205f78 -> 6db4c62ee


Revert "AMBARI-5973. Usability: Add checks for THP to the Ambari pre-req check for Linux (aonishuk)"

This reverts commit 46abfca2ddf45ba3a41af869185e4b29cbe07c3f.


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

Branch: refs/heads/trunk
Commit: 6db4c62ee0160d3788f0a632891182bc1b30a425
Parents: 5eb205f
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Tue Jun 3 13:01:45 2014 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Tue Jun 3 13:07:37 2014 +0300

----------------------------------------------------------------------
 .../stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/hook.py       | 2 +-
 .../stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py     | 2 +-
 .../1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py | 5 -----
 .../stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/hook.py       | 2 +-
 .../stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py     | 1 -
 .../2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py | 5 -----
 6 files changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6db4c62e/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/hook.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/hook.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/hook.py
index bd62959..626b199 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/hook.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/hook.py
@@ -27,8 +27,8 @@ class BeforeConfigureHook(Hook):
 
   def hook(self, env):
     import params
+
     env.set_params(params)
-    change_thp()
     install_repos()
     setup_java()
     setup_users()

http://git-wip-us.apache.org/repos/asf/ambari/blob/6db4c62e/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py
index e09b22c..e7a0d47 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py
@@ -124,7 +124,7 @@ if has_ganglia_server:
 
 hbase_tmp_dir = config['configurations']['hbase-site']['hbase.tmp.dir']
 ignore_groupsusers_create = default("ignore_groupsusers_create", False)
-transparent_huge_pages_file = "/sys/kernel/mm/redhat_transparent_hugepage/enabled"
+
 
 #repo params
 repo_info = config['hostLevelParams']['repo_info']

http://git-wip-us.apache.org/repos/asf/ambari/blob/6db4c62e/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
index f6d2a94..3a0bf93 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
@@ -196,8 +196,3 @@ def setup_java():
 
 def install_packages():
   Package(['unzip'])
-
-def change_thp():
-  import params
-  if System.get_instance().os_family == "redhat" and System.get_instance().os_major_version
== '6' :
-    Execute(format("echo never > {transparent_huge_pages_file}"))
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6db4c62e/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/hook.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/hook.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/hook.py
index 5ce7304..6904e9d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/hook.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/hook.py
@@ -26,8 +26,8 @@ class BeforeConfigureHook(Hook):
 
   def hook(self, env):
     import params
+
     env.set_params(params)
-    change_thp()
     install_repos()
     install_packages()
     setup_java()

http://git-wip-us.apache.org/repos/asf/ambari/blob/6db4c62e/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
index 17e7c6b..f55bc2d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
@@ -101,7 +101,6 @@ jce_policy_zip = default("/hostLevelParams/jce_name", None) # None when
jdk is a
 jce_location = config['hostLevelParams']['jdk_location']
 jdk_location = config['hostLevelParams']['jdk_location']
 ignore_groupsusers_create = default("ignore_groupsusers_create", False)
-transparent_huge_pages_file = "/sys/kernel/mm/redhat_transparent_hugepage/enabled"
 
 #repo params
 repo_info = config['hostLevelParams']['repo_info']

http://git-wip-us.apache.org/repos/asf/ambari/blob/6db4c62e/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
index 6f75d6a..a1196a8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
@@ -218,8 +218,3 @@ def setup_java():
 
 def install_packages():
   Package(['unzip', 'curl'])
-
-def change_thp():
-  import params
-  if System.get_instance().os_family == "redhat" and System.get_instance().os_major_version
== '6' :
-    Execute(format("echo never > {transparent_huge_pages_file}"))


Mime
View raw message