Repository: ambari Updated Branches: refs/heads/branch-2.2 c05400724 -> bc089057f
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/bc089057 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc089057 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc089057 Branch: refs/heads/branch-2.2 Commit: bc089057f002d62c55f00a24cc96789c66b7cd5e Parents: c054007 Author: Bhuvnesh Chaudhary <bchaudh...@pivotal.io> Authored: Tue Mar 15 12:19:17 2016 -0700 Committer: Bhuvnesh Chaudhary <bchaudh...@pivotal.io> Committed: Tue Mar 15 12:19:17 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/bc089057/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/bc089057/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 9ae6a77..f4570a1 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/bc089057/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..0cf8fb1 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 \ No newline at end of file
