Repository: ambari Updated Branches: refs/heads/trunk e7e865dee -> f898c0479
AMBARI-9066. Service check for Storm Fails (dlynichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f898c047 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f898c047 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f898c047 Branch: refs/heads/trunk Commit: f898c04796a7851f39228ae8d55ec4e08eda5fd4 Parents: e7e865d Author: Lisnichenko Dmitro <[email protected]> Authored: Mon Jan 12 13:48:41 2015 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Mon Jan 12 13:48:41 2015 +0200 ---------------------------------------------------------------------- .../libraries/functions/get_port_from_url.py | 3 +-- .../libraries/providers/copy_from_local.py | 5 ++++- .../libraries/providers/execute_hadoop.py | 6 +++++- .../libraries/providers/monitor_webserver.py | 5 ++++- .../libraries/providers/properties_file.py | 8 +++++++- .../resource_management/libraries/providers/repository.py | 10 +++++++++- .../libraries/providers/template_config.py | 7 ++++++- .../resource_management/libraries/providers/xml_config.py | 7 ++++++- .../STORM/0.9.1.2.1/package/scripts/drpc_server.py | 3 ++- .../STORM/0.9.1.2.1/package/scripts/nimbus.py | 3 ++- .../STORM/0.9.1.2.1/package/scripts/nimbus_prod.py | 4 ++-- .../STORM/0.9.1.2.1/package/scripts/params.py | 5 +++-- .../STORM/0.9.1.2.1/package/scripts/rest_api.py | 3 ++- .../STORM/0.9.1.2.1/package/scripts/service.py | 4 +++- .../STORM/0.9.1.2.1/package/scripts/service_check.py | 6 +++++- .../STORM/0.9.1.2.1/package/scripts/status_params.py | 5 +++-- .../STORM/0.9.1.2.1/package/scripts/storm.py | 8 +++++++- .../STORM/0.9.1.2.1/package/scripts/supervisor.py | 3 ++- .../STORM/0.9.1.2.1/package/scripts/supervisor_prod.py | 4 ++-- .../0.9.1.2.1/package/scripts/supervisord_service.py | 3 ++- .../STORM/0.9.1.2.1/package/scripts/ui_server.py | 3 ++- 21 files changed, 79 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-common/src/main/python/resource_management/libraries/functions/get_port_from_url.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/get_port_from_url.py b/ambari-common/src/main/python/resource_management/libraries/functions/get_port_from_url.py index 0f1f012..ed4586c 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/get_port_from_url.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/get_port_from_url.py @@ -20,8 +20,7 @@ Ambari Agent """ -from resource_management import * -from resource_management.libraries.functions.is_empty import * +from resource_management.libraries.functions.is_empty import is_empty from resource_management.core.exceptions import Fail import re http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-common/src/main/python/resource_management/libraries/providers/copy_from_local.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/copy_from_local.py b/ambari-common/src/main/python/resource_management/libraries/providers/copy_from_local.py index dbd54a7..8969578 100644 --- a/ambari-common/src/main/python/resource_management/libraries/providers/copy_from_local.py +++ b/ambari-common/src/main/python/resource_management/libraries/providers/copy_from_local.py @@ -21,7 +21,10 @@ Ambari Agent """ import os -from resource_management import * +from resource_management.libraries.resources.execute_hadoop import ExecuteHadoop +from resource_management.core.providers import Provider +from resource_management.libraries.functions.format import format +from resource_management.core.shell import as_user class CopyFromLocalProvider(Provider): def action_run(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-common/src/main/python/resource_management/libraries/providers/execute_hadoop.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/execute_hadoop.py b/ambari-common/src/main/python/resource_management/libraries/providers/execute_hadoop.py index c3ec7c7..7b9fdab 100644 --- a/ambari-common/src/main/python/resource_management/libraries/providers/execute_hadoop.py +++ b/ambari-common/src/main/python/resource_management/libraries/providers/execute_hadoop.py @@ -21,7 +21,11 @@ Ambari Agent """ import os -from resource_management import * +from resource_management.core.resources import Execute +from resource_management.core.providers import Provider +from resource_management.libraries.functions.format import format +from resource_management.core.environment import Environment +from resource_management.core.shell import quote_bash_args class ExecuteHadoopProvider(Provider): def action_run(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-common/src/main/python/resource_management/libraries/providers/monitor_webserver.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/monitor_webserver.py b/ambari-common/src/main/python/resource_management/libraries/providers/monitor_webserver.py index 7d2c1e1..8ed9b03 100644 --- a/ambari-common/src/main/python/resource_management/libraries/providers/monitor_webserver.py +++ b/ambari-common/src/main/python/resource_management/libraries/providers/monitor_webserver.py @@ -20,7 +20,10 @@ Ambari Agent """ -from resource_management import * +from resource_management.core.resources import Execute +from resource_management.core.providers import Provider +from resource_management.libraries.functions.format import format +from resource_management.core.shell import as_sudo from resource_management.core.system import System http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py index 94a51ff..8b2eba7 100644 --- a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py +++ b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py @@ -22,7 +22,13 @@ Ambari Agent import time import os -from resource_management import * +from resource_management.core.resources import File +from resource_management.core.providers import Provider +from resource_management.core.source import InlineTemplate +from resource_management.libraries.functions.format import format +from resource_management.core.environment import Environment +from resource_management.core.logger import Logger + class PropertiesFileProvider(Provider): def action_create(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-common/src/main/python/resource_management/libraries/providers/repository.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/repository.py b/ambari-common/src/main/python/resource_management/libraries/providers/repository.py index a0ad8f9..cca9f4d 100644 --- a/ambari-common/src/main/python/resource_management/libraries/providers/repository.py +++ b/ambari-common/src/main/python/resource_management/libraries/providers/repository.py @@ -24,7 +24,15 @@ import os import filecmp import tempfile from ambari_commons import OSCheck -from resource_management import * +from resource_management.core.resources import Execute +from resource_management.core.resources import File +from resource_management.core.providers import Provider +from resource_management.core.source import Template +from resource_management.core.source import StaticFile +from resource_management.libraries.functions.format import format +from resource_management.core.environment import Environment +from resource_management.core.shell import checked_call +import re class RhelSuseRepositoryProvider(Provider): def action_create(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-common/src/main/python/resource_management/libraries/providers/template_config.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/template_config.py b/ambari-common/src/main/python/resource_management/libraries/providers/template_config.py index 4972797..77ac749 100644 --- a/ambari-common/src/main/python/resource_management/libraries/providers/template_config.py +++ b/ambari-common/src/main/python/resource_management/libraries/providers/template_config.py @@ -21,7 +21,12 @@ Ambari Agent """ import os -from resource_management import * +from resource_management.core.resources import File +from resource_management.core.providers import Provider +from resource_management.core.source import Template +from resource_management.libraries.functions.format import format +from resource_management.core.environment import Environment + class TemplateConfigProvider(Provider): def action_create(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py index 5f30190..da7a907 100644 --- a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py +++ b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py @@ -23,7 +23,12 @@ Ambari Agent import time import os import resource_management -from resource_management import * +from resource_management.core.resources import File +from resource_management.core.providers import Provider +from resource_management.core.source import InlineTemplate +from resource_management.libraries.functions.format import format +from resource_management.core.environment import Environment +from resource_management.core.logger import Logger class XmlConfigProvider(Provider): def action_create(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py index 338195f..50deb45 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py @@ -19,7 +19,8 @@ limitations under the License. """ import sys -from resource_management import * +from resource_management.libraries.functions import check_process_status +from resource_management.libraries.script import Script from storm import storm from service import service from service_check import ServiceCheck http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py index 3ac55d7..858db80 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py @@ -19,7 +19,8 @@ limitations under the License. """ import sys -from resource_management import * +from resource_management.libraries.functions import check_process_status +from resource_management.libraries.script import Script from storm import storm from service import service http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py index 2dd8955..20b522f 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py @@ -19,7 +19,7 @@ limitations under the License. """ import sys -from resource_management import * +from resource_management.libraries.script import Script from storm import storm from supervisord_service import supervisord_service, supervisord_check_status @@ -63,4 +63,4 @@ class Nimbus(Script): supervisord_check_status("nimbus") if __name__ == "__main__": - Nimbus().execute() \ No newline at end of file + Nimbus().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py index eda153a..952a386 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py @@ -20,7 +20,8 @@ limitations under the License. from resource_management.libraries.functions.version import format_hdp_stack_version, compare_versions from resource_management.libraries.functions.default import default -from resource_management import * +from resource_management.libraries.script import Script +from resource_management.libraries.functions import default, format import status_params # server configurations @@ -92,4 +93,4 @@ if security_enabled: ams_collector_hosts = default("/clusterHostInfo/metric_collector_hosts", []) has_metric_collector = not len(ams_collector_hosts) == 0 if has_metric_collector: - metric_collector_host = ams_collector_hosts[0] \ No newline at end of file + metric_collector_host = ams_collector_hosts[0] http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py index a969987..320d020 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py @@ -19,7 +19,8 @@ limitations under the License. """ import sys -from resource_management import * +from resource_management.libraries.functions import check_process_status +from resource_management.libraries.script import Script from storm import storm from service import service http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py index ed6add5..781c7ef 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py @@ -19,7 +19,9 @@ limitations under the License. """ -from resource_management import * +from resource_management.core.resources import Execute +from resource_management.core.resources import File +from resource_management.libraries.functions.format import format import time http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service_check.py index 2661e6f..6f953d1 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service_check.py @@ -18,8 +18,12 @@ limitations under the License. """ -from resource_management import * +from resource_management.libraries.functions.format import format from resource_management.libraries.functions import get_unique_id_and_date +from resource_management.core.resources import File +from resource_management.core.resources import Execute +from resource_management.libraries.script import Script +from resource_management.core.source import StaticFile class ServiceCheck(Script): def service_check(self, env): http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/status_params.py index 5eaa446..570cd53 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/status_params.py @@ -17,7 +17,8 @@ See the License for the specific language governing permissions and limitations under the License. """ -from resource_management import * +from resource_management.libraries.script import Script +from resource_management.libraries.functions.format import format config = Script.get_config() @@ -33,4 +34,4 @@ pid_files = {"logviewer":pid_logviewer, "nimbus": pid_nimbus, "supervisor": pid_supervisor, "drpc": pid_drpc, - "rest_api": pid_rest_api} \ No newline at end of file + "rest_api": pid_rest_api} http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py index 3b71751..1a7a754 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py @@ -18,7 +18,13 @@ limitations under the License. """ -from resource_management import * +from resource_management.core.resources import File +from resource_management.core.resources import Directory +from resource_management.core.source import InlineTemplate +from resource_management.libraries.resources.template_config import TemplateConfig +from resource_management.libraries.functions.format import format +from resource_management.core.source import Template +from resource_management.libraries.functions import compare_versions from yaml_utils import escape_yaml_propetry import sys http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py index 2a21d9e..cfebb9b 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py @@ -19,7 +19,8 @@ limitations under the License. """ import sys -from resource_management import * +from resource_management.libraries.functions import check_process_status +from resource_management.libraries.script import Script from storm import storm from service import service http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py index edece81..21a1360 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py @@ -19,10 +19,10 @@ limitations under the License. """ import sys -from resource_management import * from storm import storm from service import service from supervisord_service import supervisord_service, supervisord_check_status +from resource_management.libraries.script import Script class Supervisor(Script): @@ -65,4 +65,4 @@ class Supervisor(Script): supervisord_check_status("supervisor") if __name__ == "__main__": - Supervisor().execute() \ No newline at end of file + Supervisor().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisord_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisord_service.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisord_service.py index 6a5ea0b..6ff9f9c 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisord_service.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisord_service.py @@ -18,7 +18,8 @@ limitations under the License. """ -from resource_management import * +from resource_management.core.resources.system import Execute +from resource_management.libraries.functions.format import format def supervisord_service(component_name, action): Execute(format("supervisorctl {action} storm-{component_name}"), http://git-wip-us.apache.org/repos/asf/ambari/blob/f898c047/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py index 67ebf9c..6ac75c7 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py @@ -19,10 +19,11 @@ limitations under the License. """ import sys -from resource_management import * from storm import storm from service import service from service_check import ServiceCheck +from resource_management.libraries.functions import check_process_status +from resource_management.libraries.script import Script class UiServer(Script):
