You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/04/22 03:20:11 UTC
ambari git commit: AMBARI-9993: Add support for management of Phoenix
Query Server to HDP Stack - Addendum patch 2 (Nick Dimiduk via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 55c0f792f -> 375266ddc
AMBARI-9993: Add support for management of Phoenix Query Server to HDP Stack - Addendum patch 2 (Nick Dimiduk via jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/375266dd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/375266dd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/375266dd
Branch: refs/heads/trunk
Commit: 375266ddc3aeed0ba849a87386b5b2166732f294
Parents: 55c0f79
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Tue Apr 21 18:20:05 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Tue Apr 21 18:20:05 2015 -0700
----------------------------------------------------------------------
.../HBASE/0.96.0.2.0/package/scripts/hbase.py | 2 +-
.../2.0.6/HBASE/test_phoenix_queryserver.py | 62 +-------------------
2 files changed, 2 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/375266dd/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 c5f9e7e..2ddd137 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
@@ -155,7 +155,7 @@ def hbase(name=None):
group=params.user_group,
owner=params.hbase_user
)
- if name in ["master","regionserver", "queryserver"]:
+ if name in ["master","regionserver"]:
params.HdfsDirectory(params.hbase_hdfs_root_dir,
action="create_delayed",
owner=params.hbase_user
http://git-wip-us.apache.org/repos/asf/ambari/blob/375266dd/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 1568588..0427fe9 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
@@ -266,36 +266,6 @@ class TestPhoenixQueryServer(RMFTestCase):
owner='hbase',
content='log4jproperties\nline2'
)
- self.assertResourceCalled('HdfsDirectory', 'hdfs://c6405.ambari.apache.org:8020/apps/hbase/data',
- security_enabled = False,
- keytab = UnknownConfigurationMock(),
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = '/usr/bin/kinit',
- owner = 'hbase',
- bin_dir = '/usr/hdp/current/hadoop-client/bin',
- action = ['create_delayed'],
- )
- self.assertResourceCalled('HdfsDirectory', '/apps/hbase/staging',
- security_enabled = False,
- keytab = UnknownConfigurationMock(),
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = '/usr/bin/kinit',
- mode = 0711,
- owner = 'hbase',
- bin_dir = '/usr/hdp/current/hadoop-client/bin',
- action = ['create_delayed'],
- )
- self.assertResourceCalled('HdfsDirectory', None,
- security_enabled = False,
- keytab = UnknownConfigurationMock(),
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = '/usr/bin/kinit',
- bin_dir = '/usr/hdp/current/hadoop-client/bin',
- action = ['create'],
- )
def assert_configure_secured(self):
self.assertResourceCalled('Directory', '/etc/hbase',
@@ -389,34 +359,4 @@ class TestPhoenixQueryServer(RMFTestCase):
group='hadoop',
owner='hbase',
content='log4jproperties\nline2'
- )
- self.assertResourceCalled('HdfsDirectory', 'hdfs://c6405.ambari.apache.org:8020/apps/hbase/data',
- security_enabled = True,
- keytab = '/etc/security/keytabs/hdfs.headless.keytab',
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = '/usr/bin/kinit',
- owner = 'hbase',
- bin_dir = '/usr/hdp/current/hadoop-client/bin',
- action = ['create_delayed'],
- )
- self.assertResourceCalled('HdfsDirectory', '/apps/hbase/staging',
- security_enabled = True,
- keytab = '/etc/security/keytabs/hdfs.headless.keytab',
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = '/usr/bin/kinit',
- mode = 0711,
- owner = 'hbase',
- bin_dir = '/usr/hdp/current/hadoop-client/bin',
- action = ['create_delayed'],
- )
- self.assertResourceCalled('HdfsDirectory', None,
- security_enabled = True,
- keytab = '/etc/security/keytabs/hdfs.headless.keytab',
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = '/usr/bin/kinit',
- bin_dir = '/usr/hdp/current/hadoop-client/bin',
- action = ['create'],
- )
\ No newline at end of file
+ )
\ No newline at end of file