You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by fb...@apache.org on 2015/06/18 23:45:35 UTC
ambari git commit: AMBARI-11989 [WinTP2] Atlas is not supported on
Windows for TP2
Repository: ambari
Updated Branches:
refs/heads/trunk 2c5ecc39e -> af7e26704
AMBARI-11989 [WinTP2] Atlas is not supported on Windows for TP2
Moved the Atlas driver code in the Linux-specific implementation.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af7e2670
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af7e2670
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af7e2670
Branch: refs/heads/trunk
Commit: af7e2670435fedc71c9e13c1446ba8b6fc4d1efe
Parents: 2c5ecc3
Author: Florian Barca <fb...@hortonworks.com>
Authored: Thu Jun 18 14:45:26 2015 -0700
Committer: Florian Barca <fb...@hortonworks.com>
Committed: Thu Jun 18 14:45:26 2015 -0700
----------------------------------------------------------------------
.../common-services/HIVE/0.12.0.2.0/package/scripts/hcat.py | 4 ++++
.../HIVE/0.12.0.2.0/package/scripts/hcat_client.py | 1 -
.../common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py | 4 ++++
.../HIVE/0.12.0.2.0/package/scripts/webhcat_server.py | 2 --
4 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/af7e2670/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat.py
index 1f7893d..5385099 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat.py
@@ -40,6 +40,8 @@ def hcat():
def hcat():
import params
+ from setup_atlas_hive import setup_atlas_hive
+
Directory(params.hive_conf_dir,
recursive=True,
owner=params.hcat_user,
@@ -71,3 +73,5 @@ def hcat():
group=params.user_group,
content=InlineTemplate(params.hcat_env_sh_template)
)
+
+ setup_atlas_hive()
http://git-wip-us.apache.org/repos/asf/ambari/blob/af7e2670/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py
index 1b5b768..75a37f1 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py
@@ -36,7 +36,6 @@ class HCatClient(Script):
import params
env.set_params(params)
hcat()
- setup_atlas_hive()
def status(self, env):
raise ClientComponentHasNoStatus()
http://git-wip-us.apache.org/repos/asf/ambari/blob/af7e2670/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
index c33bc90..e86b02c 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
@@ -44,6 +44,8 @@ def webhcat():
def webhcat():
import params
+ from setup_atlas_hive import setup_atlas_hive
+
Directory(params.templeton_pid_dir,
owner=params.webhcat_user,
mode=0755,
@@ -112,3 +114,5 @@ def webhcat():
owner=params.webhcat_user,
content=StaticFile(format("{config_dir}/{log4j_webhcat_filename}.template"))
)
+
+ setup_atlas_hive()
http://git-wip-us.apache.org/repos/asf/ambari/blob/af7e2670/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py
index 0473d17..012d1e2 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py
@@ -26,7 +26,6 @@ from resource_management.libraries.functions.security_commons import build_expec
FILE_TYPE_XML
from webhcat import webhcat
from webhcat_service import webhcat_service
-from setup_atlas_hive import setup_atlas_hive
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyImpl
@@ -51,7 +50,6 @@ class WebHCatServer(Script):
import params
env.set_params(params)
webhcat()
- setup_atlas_hive()
@OsFamilyImpl(os_family=OSConst.WINSRV_FAMILY)