Repository: ambari Updated Branches: refs/heads/trunk e7ae14918 -> 24c6d1f21
AMBARI-16885: Change location of HAWQ tmp directories (mithmatt) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24c6d1f2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24c6d1f2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24c6d1f2 Branch: refs/heads/trunk Commit: 24c6d1f21e299a67a65b3390d8e659b60baa93e5 Parents: e7ae149 Author: Matt <mmat...@pivotal.io> Authored: Wed May 25 14:00:20 2016 -0700 Committer: Matt <mmat...@pivotal.io> Committed: Wed May 25 14:00:20 2016 -0700 ---------------------------------------------------------------------- .../common-services/HAWQ/2.0.0/configuration/hawq-site.xml | 8 ++++---- .../HAWQ/2.0.0/package/scripts/hawq_constants.py | 2 +- .../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 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/24c6d1f2/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 c3b1f82..5be3848 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 @@ -116,11 +116,11 @@ <property> <name>hawq_master_temp_directory</name> <display-name>HAWQ Master Temp Directories</display-name> - <value>/tmp/hawq/master</value> + <value>/data/hawq/tmp/master</value> <description> Used as temporary filespace to store workfile cache, sort/join temp files etc. The recommended number of temp directories is equal to the number of disks per node, one directory on each disk, - excluding system disk. Separate multiple entries with commas. The default is /tmp/hawq/master. + excluding system disk. Separate multiple entries with commas. The default is /data/hawq/tmp/master. </description> <value-attributes> <type>directory</type> @@ -130,11 +130,11 @@ <property> <name>hawq_segment_temp_directory</name> <display-name>HAWQ Segment Temp Directories</display-name> - <value>/tmp/hawq/segment</value> + <value>/data/hawq/tmp/segment</value> <description> Used as temporary filespace to store workfile cache, sort/join temp files etc. The recommended number of temp directories is equal to the number of disks per node, one directory on each disk, - excluding system disk. Separate multiple entries with commas. The default is /tmp/hawq/segment. + excluding system disk. Separate multiple entries with commas. The default is /data/hawq/tmp/segment. </description> <value-attributes> <type>directory</type> http://git-wip-us.apache.org/repos/asf/ambari/blob/24c6d1f2/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py index 919d7d8..4a75a78 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py @@ -40,7 +40,7 @@ hawq_group_secured = hawq_user_secured hawq_home_dir = "/usr/local/hawq/" hawq_config_dir = "/usr/local/hawq/etc/" hawq_pid_dir = "/var/run/hawq/" -hawq_tmp_dir = '/tmp/hawq/' +hawq_tmp_dir = '/data/hawq/tmp' hawq_user_home_dir = os.path.expanduser("~{0}".format(hawq_user)) limits_conf_dir = "/etc/security/limits.d" sysctl_conf_dir = "/etc/sysctl.d" http://git-wip-us.apache.org/repos/asf/ambari/blob/24c6d1f2/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 5cf2d2f..70d7ed1 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 @@ -121,7 +121,7 @@ class TestHawqMaster(RMFTestCase): timeout = 600 ) - self.assertResourceCalled('Directory', '/tmp/hawq/master', + self.assertResourceCalled('Directory', '/data/hawq/tmp/master', group = self.GPADMIN, owner = self.GPADMIN, create_parents = True http://git-wip-us.apache.org/repos/asf/ambari/blob/24c6d1f2/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 fde5fd3..8639ca5 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 @@ -93,7 +93,7 @@ class TestHawqSegment(RMFTestCase): timeout = 600 ) - self.assertResourceCalled('Directory', '/tmp/hawq/segment', + self.assertResourceCalled('Directory', '/data/hawq/tmp/segment', owner = self.GPADMIN, group = self.GPADMIN, create_parents = True http://git-wip-us.apache.org/repos/asf/ambari/blob/24c6d1f2/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 4e2a9cd..185bde8 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 @@ -108,7 +108,7 @@ class TestHawqStandby(RMFTestCase): timeout = 600 ) - self.assertResourceCalled('Directory', '/tmp/hawq/master', + self.assertResourceCalled('Directory', '/data/hawq/tmp/master', group = self.GPADMIN, owner = self.GPADMIN, create_parents = True http://git-wip-us.apache.org/repos/asf/ambari/blob/24c6d1f2/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 36513c5..b839de6 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 @@ -652,10 +652,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", + "hawq_master_temp_directory": "/data/hawq/tmp/master", "hawq_standby_address_host": "c6402.ambari.apache.org", "hawq_master_address_port": "5432", - "hawq_segment_temp_directory": "/tmp/hawq/segment", + "hawq_segment_temp_directory": "/data/hawq/tmp/segment", "hawq_master_address_host": "c6403.ambari.apache.org", "hawq_rm_yarn_queue_name": "default", "hawq_rm_yarn_address": "c6402.ambari.apache.org:8032",
