[06/22] ambari git commit: Revert "AMBARI-14718. on region server restart ambari is setting /tmp to hbase:hadoop (aonishuk)"

[ncole]

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 
Authored: Wed Jan 20 10:32:35 2016 -0800
Committer: Mahadev Konar 
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.
 
   
 hbase_java_io_tmpdir
-{{exec_tmp_dir}}/hbase_java_io_tmpdir
+/tmp
 Used in hbase-env.sh as 
HBASE_OPTS=-Djava.io.tmpdir=java_io_tmpdir
 
   directory

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 

ambari git commit: Revert "AMBARI-14718. on region server restart ambari is setting /tmp to hbase:hadoop (aonishuk)"

[mahadev]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 ed67e8bb6 -> 362d4850e


Revert "AMBARI-14718. on region server restart ambari is setting /tmp to 
hbase:hadoop (aonishuk)"

This reverts commit bd4892b33a8a9e641d9cafd7a33376ad5ff748e2.


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

Branch: refs/heads/branch-2.2
Commit: 362d4850eb18a56d8d38ce0e598c050b73fda5ac
Parents: ed67e8b
Author: Mahadev Konar 
Authored: Wed Jan 20 10:31:44 2016 -0800
Committer: Mahadev Konar 
Committed: Wed Jan 20 10:31:44 2016 -0800

--
 .../HBASE/0.96.0.2.0/configuration/hbase-env.xml | 2 +-
 .../HBASE/0.96.0.2.0/package/scripts/hbase.py| 7 ---
 .../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, 29 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/362d4850/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 981586d..47a753a 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
@@ -112,7 +112,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds 
this value.
 
   
 hbase_java_io_tmpdir
-{{exec_tmp_dir}}/hbase_java_io_tmpdir
+/tmp
 Used in hbase-env.sh as 
HBASE_OPTS=-Djava.io.tmpdir=java_io_tmpdir
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/362d4850/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 667b1d3..2b2cf1e 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,9 +56,11 @@ def hbase(name=None):
   recursive = True
   )
 
-  Directory(InlineTemplate(params.java_io_tmpdir).get_content(),
+  Directory(params.java_io_tmpdir,
+  owner = params.hbase_user,
+  group = params.user_group,
   recursive = True,
-  mode=0777,
+  mode=0777
   )
 
   parent_dir = os.path.dirname(params.tmp_dir)

http://git-wip-us.apache.org/repos/asf/ambari/blob/362d4850/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 27a4e84..7deef41 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
@@ -37,6 +37,8 @@ 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/362d4850/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
--
diff --git 

ambari git commit: Revert "AMBARI-14718. on region server restart ambari is setting /tmp to hbase:hadoop (aonishuk)"

[mahadev]

Repository: ambari
Updated Branches:
  refs/heads/trunk ddf479ef9 -> 862336189


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/trunk
Commit: 862336189317b6dab6e86377049532d5264f0636
Parents: ddf479e
Author: Mahadev Konar 
Authored: Wed Jan 20 10:32:35 2016 -0800
Committer: Mahadev Konar 
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.
 
   
 hbase_java_io_tmpdir
-{{exec_tmp_dir}}/hbase_java_io_tmpdir
+/tmp
 Used in hbase-env.sh as 
HBASE_OPTS=-Djava.io.tmpdir=java_io_tmpdir
 
   directory

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