You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by bh...@apache.org on 2016/03/15 20:17:52 UTC
ambari git commit: AMBARI-15387: Pxf service status is red (gowtam
tadi via bhuvnesh2703)
Repository: ambari
Updated Branches:
refs/heads/trunk 63baf1844 -> 40a906ec2
AMBARI-15387: Pxf service status is red (gowtam tadi via bhuvnesh2703)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/40a906ec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/40a906ec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/40a906ec
Branch: refs/heads/trunk
Commit: 40a906ec26ad5b8c68d0dba377ff69841dc7a356
Parents: 63baf18
Author: Bhuvnesh Chaudhary <bc...@pivotal.io>
Authored: Tue Mar 15 12:18:09 2016 -0700
Committer: Bhuvnesh Chaudhary <bc...@pivotal.io>
Committed: Tue Mar 15 12:18:09 2016 -0700
----------------------------------------------------------------------
.../common-services/PXF/3.0.0/package/scripts/params.py | 6 +++---
.../resources/common-services/PXF/3.0.0/package/scripts/pxf.py | 6 +++---
.../common-services/PXF/3.0.0/package/scripts/pxf_constants.py | 3 +++
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/40a906ec/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
index 0bae970..eed2d18 100644
--- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
@@ -17,7 +17,7 @@ limitations under the License.
"""
import functools
-
+import pxf_constants
from resource_management import Script
from resource_management.libraries.functions.default import default
from resource_management.libraries.functions import get_kinit_path
@@ -27,11 +27,11 @@ from resource_management.libraries.functions.get_not_managed_resources import ge
config = Script.get_config()
-pxf_service_name = "pxf-service"
+pxf_service_name = pxf_constants.pxf_service_name
stack_name = str(config["hostLevelParams"]["stack_name"])
# Users and Groups
-pxf_user = "pxf"
+pxf_user = pxf_constants.pxf_user
pxf_group = pxf_user
hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
hdfs_superuser_group = config["configurations"]["hdfs-site"]["dfs.permissions.superusergroup"]
http://git-wip-us.apache.org/repos/asf/ambari/blob/40a906ec/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
index c3da47f..15dd325 100644
--- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
+++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
@@ -70,9 +70,9 @@ class Pxf(Script):
def __execute_service_command(self, command):
- import params
- Execute("service {0} {1}".format(params.pxf_service_name, command),
- timeout=params.default_exec_timeout,
+ import pxf_constants
+ Execute("service {0} {1}".format(pxf_constants.pxf_service_name, command),
+ timeout=pxf_constants.default_exec_timeout,
logoutput=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/40a906ec/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
index 1d88893..7480be0 100644
--- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
+++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
@@ -28,3 +28,6 @@ hbase_populate_data_script = "hbase-populate-data.sh"
hbase_cleanup_data_script = "hbase-cleanup-data.sh"
pxf_hive_test_table = "pxf_hive_smoke_test_table"
hive_populate_data_script = "hive-populate-data.hql"
+pxf_service_name = "pxf-service"
+pxf_user = "pxf"
+default_exec_timeout = 600