Repository: ambari Updated Branches: refs/heads/trunk 15c992c5b -> ba59c242d
AMBARI-15172: HAWQ temp directories should not be /tmp (adenissov via jaoki) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ba59c242 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ba59c242 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ba59c242 Branch: refs/heads/trunk Commit: ba59c242d65428e1ebcf7758a2dd7de3e90c7f5b Parents: 15c992c Author: Jun Aoki <ja...@apache.org> Authored: Mon Feb 29 12:34:59 2016 -0800 Committer: Jun Aoki <ja...@apache.org> Committed: Mon Feb 29 12:34:59 2016 -0800 ---------------------------------------------------------------------- .../common-services/HAWQ/2.0.0/configuration/hawq-site.xml | 4 ++-- ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py | 2 +- .../src/test/python/stacks/2.3/HAWQ/test_hawqsegment.py | 2 +- .../src/test/python/stacks/2.3/HAWQ/test_hawqstandby.py | 2 +- .../src/test/python/stacks/2.3/configs/hawq_default.json | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ba59c242/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml index f195215..457c1d2 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml @@ -100,7 +100,7 @@ <property> <name>hawq_master_temp_directory</name> <display-name>HAWQ Master Temp Directory</display-name> - <value>/tmp</value> + <value>/tmp/hawq/master</value> <description> The temporary directory reserved for HAWQ master. </description> @@ -112,7 +112,7 @@ <property> <name>hawq_segment_temp_directory</name> <display-name>HAWQ Segment Temp Directory</display-name> - <value>/tmp</value> + <value>/tmp/hawq/segment</value> <description> The temporary directory reserved for HAWQ segment. </description> http://git-wip-us.apache.org/repos/asf/ambari/blob/ba59c242/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py b/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py index 355207c..56fc5e4 100644 --- a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py +++ b/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py @@ -99,7 +99,7 @@ class TestHawqMaster(RMFTestCase): create_parents = True ) - self.assertResourceCalled('Directory', '/tmp', + self.assertResourceCalled('Directory', '/tmp/hawq/master', group = self.GPADMIN, owner = self.GPADMIN, create_parents = True http://git-wip-us.apache.org/repos/asf/ambari/blob/ba59c242/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqsegment.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqsegment.py b/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqsegment.py index 66800ea..b6c682f 100644 --- a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqsegment.py +++ b/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqsegment.py @@ -121,7 +121,7 @@ class TestHawqSegment(RMFTestCase): create_parents = True ) - self.assertResourceCalled('Directory', '/tmp', + self.assertResourceCalled('Directory', '/tmp/hawq/segment', owner = self.GPADMIN, group = self.GPADMIN, create_parents = True http://git-wip-us.apache.org/repos/asf/ambari/blob/ba59c242/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqstandby.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqstandby.py b/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqstandby.py index 26a211d..7f4d3af 100644 --- a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqstandby.py +++ b/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqstandby.py @@ -98,7 +98,7 @@ class TestHawqStandby(RMFTestCase): create_parents = True ) - self.assertResourceCalled('Directory', '/tmp', + self.assertResourceCalled('Directory', '/tmp/hawq/master', group = self.GPADMIN, owner = self.GPADMIN, create_parents = True http://git-wip-us.apache.org/repos/asf/ambari/blob/ba59c242/ambari-server/src/test/python/stacks/2.3/configs/hawq_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hawq_default.json b/ambari-server/src/test/python/stacks/2.3/configs/hawq_default.json index abe3559..241547d 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/hawq_default.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/hawq_default.json @@ -650,10 +650,10 @@ "hawq_re_cgroup_hierarchy_name": "hawq", "hawq_master_directory": "/data/hawq/master", "hawq_segment_address_port": "40000", - "hawq_master_temp_directory": "/tmp", + "hawq_master_temp_directory": "/tmp/hawq/master", "hawq_standby_address_host": "c6402.ambari.apache.org", "hawq_master_address_port": "5432", - "hawq_segment_temp_directory": "/tmp", + "hawq_segment_temp_directory": "/tmp/hawq/segment", "hawq_master_address_host": "c6403.ambari.apache.org", "hawq_rm_yarn_queue_name": "default", "hawq_rm_yarn_address": "c6402.ambari.apache.org:8032",
