You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/01/21 20:21:05 UTC
[06/22] ambari git commit: Revert "AMBARI-14718. on region server
restart ambari is setting /tmp to hbase:hadoop (aonishuk)"
Revert "AMBARI-14718. on region server restart ambari is setting /tmp to hbase:hadoop (aonishuk)"
This reverts commit 1c2c6a9f6678931936585761a242651b8a6871ce.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/86233618
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/86233618
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/86233618
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 862336189317b6dab6e86377049532d5264f0636
Parents: ddf479e
Author: Mahadev Konar <ma...@apache.org>
Authored: Wed Jan 20 10:32:35 2016 -0800
Committer: Mahadev Konar <ma...@apache.org>
Committed: Wed Jan 20 10:32:35 2016 -0800
----------------------------------------------------------------------
.../HBASE/0.96.0.2.0/configuration/hbase-env.xml | 2 +-
.../HBASE/0.96.0.2.0/package/scripts/hbase.py | 5 +++--
.../HBASE/0.96.0.2.0/package/scripts/params_linux.py | 2 ++
.../src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py | 4 ++++
.../src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py | 6 ++++++
.../python/stacks/2.0.6/HBASE/test_hbase_regionserver.py | 8 ++++++++
.../python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py | 4 ++++
7 files changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/86233618/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
index 62c7c93..cabd4fd 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
@@ -115,7 +115,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
<property>
<name>hbase_java_io_tmpdir</name>
- <value>{{exec_tmp_dir}}/hbase_java_io_tmpdir</value>
+ <value>/tmp</value>
<description>Used in hbase-env.sh as HBASE_OPTS=-Djava.io.tmpdir=java_io_tmpdir</description>
<value-attributes>
<type>directory</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/86233618/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
index 71ce02b..c407a93 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
@@ -22,7 +22,6 @@ from resource_management import *
import sys
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
from ambari_commons import OSConst
-from resource_management.core.source import InlineTemplate
@OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY)
@@ -57,7 +56,9 @@ def hbase(name=None):
create_parents = True
)
- Directory(InlineTemplate(params.java_io_tmpdir).get_content(),
+ Directory(params.java_io_tmpdir,
+ owner = params.hbase_user,
+ group = params.user_group,
create_parents = True,
mode=0777
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/86233618/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 337f09d..f37844c 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -36,6 +36,8 @@ from resource_management.libraries.functions import is_empty
from resource_management.libraries.functions import get_unique_id_and_date
from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions.substitute_vars import substitute_vars
+
# server configurations
config = Script.get_config()
exec_tmp_dir = Script.get_tmp_dir()
http://git-wip-us.apache.org/repos/asf/ambari/blob/86233618/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
index 6dc4b0b..9f3e19e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
@@ -47,6 +47,8 @@ class TestHBaseClient(RMFTestCase):
create_parents = True,
)
self.assertResourceCalled('Directory', '/tmp',
+ owner = 'hbase',
+ group = 'hadoop',
create_parents = True,
mode = 0777
)
@@ -143,6 +145,8 @@ class TestHBaseClient(RMFTestCase):
create_parents = True,
)
self.assertResourceCalled('Directory', '/tmp',
+ owner = 'hbase',
+ group = 'hadoop',
create_parents = True,
mode = 0777
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/86233618/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index 13b2e33..7c6d10e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -243,6 +243,8 @@ class TestHBaseMaster(RMFTestCase):
create_parents = True,
)
self.assertResourceCalled('Directory', '/tmp',
+ owner = 'hbase',
+ group = 'hadoop',
create_parents = True,
mode = 0777
)
@@ -378,6 +380,8 @@ class TestHBaseMaster(RMFTestCase):
create_parents = True,
)
self.assertResourceCalled('Directory', '/tmp',
+ owner = 'hbase',
+ group = 'hadoop',
create_parents = True,
mode = 0777
)
@@ -522,6 +526,8 @@ class TestHBaseMaster(RMFTestCase):
group = 'hadoop',
create_parents = True)
self.assertResourceCalled('Directory', '/tmp',
+ owner = 'hbase',
+ group = 'hadoop',
create_parents = True,
mode = 0777
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/86233618/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
index 58ca7ef..c36bd89 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
@@ -136,6 +136,8 @@ class TestHbaseRegionServer(RMFTestCase):
create_parents = True,
)
self.assertResourceCalled('Directory', '/tmp',
+ owner = 'hbase',
+ group = 'hadoop',
create_parents = True,
mode = 0777
)
@@ -232,6 +234,8 @@ class TestHbaseRegionServer(RMFTestCase):
create_parents = True,
)
self.assertResourceCalled('Directory', '/tmp',
+ owner = 'hbase',
+ group = 'hadoop',
create_parents = True,
mode = 0777
)
@@ -338,6 +342,8 @@ class TestHbaseRegionServer(RMFTestCase):
group = 'hadoop',
create_parents = True)
self.assertResourceCalled('Directory', '/tmp',
+ owner = 'hbase',
+ group = 'hadoop',
create_parents = True,
mode = 0777
)
@@ -452,6 +458,8 @@ class TestHbaseRegionServer(RMFTestCase):
group = 'hadoop',
create_parents = True)
self.assertResourceCalled('Directory', '/tmp',
+ owner = 'hbase',
+ group = 'hadoop',
create_parents = True,
mode = 0777
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/86233618/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
index 7722af0..6f3199e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
@@ -238,6 +238,8 @@ class TestPhoenixQueryServer(RMFTestCase):
create_parents = True,
)
self.assertResourceCalled('Directory', '/tmp',
+ owner = 'hbase',
+ group = 'hadoop',
create_parents = True,
mode = 0777
)
@@ -349,6 +351,8 @@ class TestPhoenixQueryServer(RMFTestCase):
create_parents = True,
)
self.assertResourceCalled('Directory', '/tmp',
+ owner = 'hbase',
+ group = 'hadoop',
create_parents = True,
mode = 0777
)