Repository: metron Updated Branches: refs/heads/master 42fff7411 -> df25d81c4
METRON-1076 Management UI status check always reports the service as running (merrimanr) closes apache/metron#678 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/df25d81c Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/df25d81c Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/df25d81c Branch: refs/heads/master Commit: df25d81c41b7ad5381ac8ff9f42c320ba72f43dd Parents: 42fff74 Author: merrimanr <[email protected]> Authored: Fri Aug 4 08:50:17 2017 -0500 Committer: merrimanr <[email protected]> Committed: Fri Aug 4 08:50:17 2017 -0500 ---------------------------------------------------------------------- .../METRON/CURRENT/package/scripts/management_ui_master.py | 7 +++++-- .../METRON/CURRENT/package/scripts/params/params_linux.py | 4 ++-- .../METRON/CURRENT/package/scripts/params/status_params.py | 6 ++++++ .../METRON/CURRENT/package/scripts/rest_master.py | 8 +++++--- 4 files changed, 18 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/df25d81c/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py index 86d94e6..8ab82a8 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py @@ -23,6 +23,7 @@ from resource_management.core.resources.system import Directory from resource_management.core.resources.system import File from resource_management.core.source import Template from resource_management.libraries.functions.format import format +from resource_management.libraries.functions.get_user_call_output import get_user_call_output from resource_management.libraries.script import Script from resource_management.core.resources.system import Execute @@ -76,9 +77,11 @@ class ManagementUIMaster(Script): commands.stop_management_ui() def status(self, env): - status_cmd = format('service metron-management-ui status') + from params import status_params + env.set_params(status_params) + cmd = format('curl --max-time 3 {hostname}:{metron_management_ui_port}') try: - Execute(status_cmd) + get_user_call_output(cmd, user=status_params.metron_user) except ExecutionFailed: raise ComponentIsNotRunning() http://git-wip-us.apache.org/repos/asf/metron/blob/df25d81c/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py index 3f84ef5..3e75cb6 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py @@ -45,8 +45,8 @@ metron_user = status_params.metron_user metron_group = config['configurations']['metron-env']['metron_group'] metron_log_dir = config['configurations']['metron-env']['metron_log_dir'] metron_pid_dir = config['configurations']['metron-env']['metron_pid_dir'] -metron_rest_port = config['configurations']['metron-rest-env']['metron_rest_port'] -metron_management_ui_port = config['configurations']['metron-management-ui-env']['metron_management_ui_port'] +metron_rest_port = status_params.metron_rest_port +metron_management_ui_port = status_params.metron_management_ui_port metron_jvm_flags = config['configurations']['metron-rest-env']['metron_jvm_flags'] metron_spring_profiles_active = config['configurations']['metron-rest-env']['metron_spring_profiles_active'] metron_jdbc_driver = config['configurations']['metron-rest-env']['metron_jdbc_driver'] http://git-wip-us.apache.org/repos/asf/metron/blob/df25d81c/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py index 072a371..c5e36b0 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py @@ -57,6 +57,12 @@ indexing_configured_flag_file = metron_zookeeper_config_path + '/../metron_index indexing_acl_configured_flag_file = metron_zookeeper_config_path + '/../metron_indexing_acl_configured' indexing_hdfs_perm_configured_flag_file = metron_zookeeper_config_path + '/../metron_indexing_hdfs_perm_configured' +# REST +metron_rest_port = config['configurations']['metron-rest-env']['metron_rest_port'] + +# UI +metron_management_ui_port = config['configurations']['metron-management-ui-env']['metron_management_ui_port'] + # Storm storm_rest_addr = config['configurations']['metron-env']['storm_rest_addr'] http://git-wip-us.apache.org/repos/asf/metron/blob/df25d81c/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py index 0d8d630..dc0a27f 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py @@ -23,8 +23,8 @@ from resource_management.core.resources.system import Directory from resource_management.core.resources.system import File from resource_management.core.source import Template from resource_management.libraries.functions.format import format +from resource_management.libraries.functions.get_user_call_output import get_user_call_output from resource_management.libraries.script import Script -from resource_management.core.resources.system import Execute from rest_commands import RestCommands @@ -65,9 +65,11 @@ class RestMaster(Script): commands.stop_rest_application() def status(self, env): - status_cmd = format('service metron-rest status') + from params import status_params + env.set_params(status_params) + cmd = format('curl --max-time 3 {hostname}:{metron_rest_port}') try: - Execute(status_cmd) + get_user_call_output(cmd, user=status_params.metron_user) except ExecutionFailed: raise ComponentIsNotRunning()
