ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject ambari git commit: AMBARI-12377. Installer wizard: webhcat server start fails (Eugene Chekanskiy via ncole)
Date Fri, 10 Jul 2015 18:36:58 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 45de5f923 -> 8905ec1dd


AMBARI-12377. Installer wizard: webhcat server start fails (Eugene Chekanskiy via ncole)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8905ec1d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8905ec1d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8905ec1d

Branch: refs/heads/branch-2.1
Commit: 8905ec1dd06a80e7d5c257c657ad3d97a679f886
Parents: 45de5f9
Author: Nate Cole <ncole@hortonworks.com>
Authored: Fri Jul 10 14:25:46 2015 -0400
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Fri Jul 10 14:25:46 2015 -0400

----------------------------------------------------------------------
 .../HIVE/0.12.0.2.0/package/scripts/setup_atlas_hive.py     | 9 ++++++---
 .../HIVE/0.12.0.2.0/package/scripts/webhcat.py              | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8905ec1d/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_atlas_hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_atlas_hive.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_atlas_hive.py
index a956c6c..222a8c6 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_atlas_hive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_atlas_hive.py
@@ -22,15 +22,18 @@ from resource_management.libraries.resources.properties_file import PropertiesFi
 from resource_management.core.resources.packaging import Package
 from resource_management.libraries.functions.format import format
 
-def setup_atlas_hive():
+def setup_atlas_hive(configuration_directory=None):
   import params
-  
+
   if params.has_atlas:
+    if configuration_directory is None:
+      configuration_directory = format("{hive_config_dir}")
+
     if not params.host_sys_prepped:
       Package(params.atlas_plugin_package, # FIXME HACK: install the package during RESTART/START
when install_packages is not triggered.
       )
 
-    PropertiesFile(format('{hive_config_dir}/client.properties'),
+    PropertiesFile(format('{configuration_directory}/client.properties'),
                    properties = params.atlas_client_props,
                    owner = params.hive_user,
                    group = params.user_group,

http://git-wip-us.apache.org/repos/asf/ambari/blob/8905ec1d/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 e86b02c..c7b1e10 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
@@ -115,4 +115,4 @@ def webhcat():
          content=StaticFile(format("{config_dir}/{log4j_webhcat_filename}.template"))
     )
 
-  setup_atlas_hive()
+  setup_atlas_hive(configuration_directory=params.config_dir)


Mime
View raw message