ambari git commit: AMBARI-15475: Editing tmp dir from single to multiple dir doesn't trigger the backend change

2016-03-19 Thread jaoki 
Repository: ambari
Updated Branches:
  refs/heads/trunk 74f314598 -> b65b7c2dd


AMBARI-15475: Editing tmp dir from single to multiple dir doesn't trigger the 
backend change


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

Branch: refs/heads/trunk
Commit: b65b7c2ddbe6e11d8c0514346f2c00da3feceaae
Parents: 74f3145
Author: Jun Aoki 
Authored: Sat Mar 19 01:13:08 2016 -0700
Committer: Jun Aoki 
Committed: Sat Mar 19 01:13:08 2016 -0700

--
 .../HAWQ/2.0.0/package/scripts/common.py | 14 ++
 .../HAWQ/2.0.0/package/scripts/hawqsegment.py|  7 +++
 .../HAWQ/2.0.0/package/scripts/master_helper.py  | 15 ++-
 .../HAWQ/2.0.0/package/scripts/params.py |  4 ++--
 .../test/python/stacks/2.3/HAWQ/test_hawqmaster.py   | 10 +-
 .../test/python/stacks/2.3/HAWQ/test_hawqsegment.py  | 13 +
 .../test/python/stacks/2.3/HAWQ/test_hawqstandby.py  | 10 +-
 7 files changed, 40 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b65b7c2d/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
index 00349d8..0631144 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
@@ -52,6 +52,20 @@ def __create_hawq_user():
groups=[hawq_constants.hawq_group, params.user_group],
ignore_failures=True)
 
+def create_master_dir(dir_path):
+  """
+  Creates the master directory (hawq_master_dir or hawq_segment_dir) for HAWQ
+  """
+  utils.create_dir_as_hawq_user(dir_path)
+  Execute("chmod 700 {0}".format(dir_path), user=hawq_constants.root_user, 
timeout=hawq_constants.default_exec_timeout)
+
+def create_temp_dirs(dir_paths):
+  """
+  Creates the temp directories (hawq_master_temp_dir or hawq_segment_temp_dir) 
for HAWQ
+  """
+  for path in dir_paths.split(','):
+if path != "":
+  utils.create_dir_as_hawq_user(path)
 
 def __set_home_dir_ownership():
   """

http://git-wip-us.apache.org/repos/asf/ambari/blob/b65b7c2d/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
index 0a597b6..1891ede 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
@@ -42,6 +42,8 @@ class HawqSegment(Script):
 env.set_params(hawq_constants)
 common.setup_user()
 common.setup_common_configurations()
+# temp directories are stateless and they should be recreated when 
configured (started)
+common.create_temp_dirs(params.hawq_segment_temp_dirs)
 
 
   def __start_segment(self):
@@ -80,10 +82,7 @@ class HawqSegment(Script):
   @staticmethod
   def __init_segment():
 import params
-
-# Create segment directories
-utils.create_dir_as_hawq_user(params.hawq_segment_dir)
-utils.create_dir_as_hawq_user(params.hawq_segment_temp_dir.split(','))
+common.create_master_dir(params.hawq_segment_dir)
 
 # Initialize hawq segment
 utils.exec_hawq_operation(hawq_constants.INIT, "{0} -a 
-v".format(hawq_constants.SEGMENT))

http://git-wip-us.apache.org/repos/asf/ambari/blob/b65b7c2d/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
index 9482b35..330b6c0 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
@@ -59,20 +59,9 @@ def configure_master():
   common.setup_user()
   common.setup_common_configurations()
   __setup_master_specific_conf_files()
-  __create_local_dirs()
-
-
-def __create_local_dirs():
-  """
-

ambari git commit: AMBARI-15475: Editing tmp dir from single to multiple dir doesn't trigger the backend change

2016-03-18 Thread jaoki 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 edfbe19b6 -> e4899550f


AMBARI-15475: Editing tmp dir from single to multiple dir doesn't trigger the 
backend change


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

Branch: refs/heads/branch-2.2
Commit: e4899550fc1f8f1fbfb17228175e15aa4cd8a18c
Parents: edfbe19
Author: Jun Aoki 
Authored: Fri Mar 18 18:16:48 2016 -0700
Committer: Jun Aoki 
Committed: Fri Mar 18 18:16:48 2016 -0700

--
 .../HAWQ/2.0.0/package/scripts/common.py | 14 ++
 .../HAWQ/2.0.0/package/scripts/hawqsegment.py|  7 +++
 .../HAWQ/2.0.0/package/scripts/master_helper.py  | 15 ++-
 .../HAWQ/2.0.0/package/scripts/params.py |  4 ++--
 .../HAWQ/2.0.0/package/scripts/utils.py  |  6 +-
 .../test/python/stacks/2.3/HAWQ/test_hawqmaster.py   | 10 +-
 .../test/python/stacks/2.3/HAWQ/test_hawqsegment.py  | 13 +
 .../test/python/stacks/2.3/HAWQ/test_hawqstandby.py  |  9 +
 8 files changed, 45 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e4899550/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
index d62332d..20336bc 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
@@ -52,6 +52,20 @@ def __create_hawq_user():
groups=[hawq_constants.hawq_group, params.user_group],
ignore_failures=True)
 
+def create_master_dir(dir_path):
+  """
+  Creates the master directory (hawq_master_dir or hawq_segment_dir) for HAWQ
+  """
+  utils.create_dir_as_hawq_user(dir_path)
+  Execute("chmod 700 {0}".format(dir_path), user=hawq_constants.root_user, 
timeout=hawq_constants.default_exec_timeout)
+
+def create_temp_dirs(dir_paths):
+  """
+  Creates the temp directories (hawq_master_temp_dir or hawq_segment_temp_dir) 
for HAWQ
+  """
+  for path in dir_paths.split(','):
+if path != "":
+  utils.create_dir_as_hawq_user(path)
 
 def __set_home_dir_ownership():
   """

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4899550/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
index 0a597b6..1891ede 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
@@ -42,6 +42,8 @@ class HawqSegment(Script):
 env.set_params(hawq_constants)
 common.setup_user()
 common.setup_common_configurations()
+# temp directories are stateless and they should be recreated when 
configured (started)
+common.create_temp_dirs(params.hawq_segment_temp_dirs)
 
 
   def __start_segment(self):
@@ -80,10 +82,7 @@ class HawqSegment(Script):
   @staticmethod
   def __init_segment():
 import params
-
-# Create segment directories
-utils.create_dir_as_hawq_user(params.hawq_segment_dir)
-utils.create_dir_as_hawq_user(params.hawq_segment_temp_dir.split(','))
+common.create_master_dir(params.hawq_segment_dir)
 
 # Initialize hawq segment
 utils.exec_hawq_operation(hawq_constants.INIT, "{0} -a 
-v".format(hawq_constants.SEGMENT))

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4899550/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
index 9482b35..330b6c0 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
@@ -59,20 +59,9 @@ def configure_master():
   common.setup_user()
   common.setup_common_configurations()
   __setup_master_specific_con