Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21348 d85292828 -> 267cd8b0c
AMBARI-20950. HdfsResource can not handle S3 URL when hbase.rootdir is set to S3 URL (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/75026913 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/75026913 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/75026913 Branch: refs/heads/branch-feature-AMBARI-21348 Commit: 7502691354f4bad8eee47885cac24a4e528d9fc7 Parents: 065dd9c Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Mon Jul 10 12:58:16 2017 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Mon Jul 10 12:58:16 2017 +0300 ---------------------------------------------------------------------- .../HBASE/0.96.0.2.0/package/scripts/hbase.py | 12 +++++++----- .../HBASE/0.96.0.2.0/package/scripts/params_linux.py | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/75026913/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 68856ce..ac71ce4 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 @@ -17,6 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. """ +from urlparse import urlparse import os from resource_management import * import sys @@ -193,11 +194,12 @@ def hbase(name=None): owner=params.hbase_user ) if name == "master": - params.HdfsResource(params.hbase_hdfs_root_dir, - type="directory", - action="create_on_execute", - owner=params.hbase_user - ) + if not params.hbase_hdfs_root_dir_protocol or params.hbase_hdfs_root_dir_protocol == urlparse(params.default_fs).scheme: + params.HdfsResource(params.hbase_hdfs_root_dir, + type="directory", + action="create_on_execute", + owner=params.hbase_user + ) params.HdfsResource(params.hbase_staging_dir, type="directory", action="create_on_execute", http://git-wip-us.apache.org/repos/asf/ambari/blob/75026913/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 43c6036..1ee5248 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 @@ -17,6 +17,8 @@ See the License for the specific language governing permissions and limitations under the License. """ +from urlparse import urlparse + import status_params import ambari_simplejson as json # simplejson is much faster comparing to Python 2.6 json module and has the same functions set. @@ -234,6 +236,7 @@ else: hbase_env_sh_template = config['configurations']['hbase-env']['content'] hbase_hdfs_root_dir = config['configurations']['hbase-site']['hbase.rootdir'] +hbase_hdfs_root_dir_protocol = urlparse(hbase_hdfs_root_dir).scheme hbase_staging_dir = "/apps/hbase/staging" #for create_hdfs_directory hostname = config["hostname"]
