You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2016/06/01 03:07:43 UTC
ambari git commit: AMBARI-16850: clean up import * for ZOOKEEPER
service (Juanjo Marron via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 3e45c8fe2 -> 10ad39cfd
AMBARI-16850: clean up import * for ZOOKEEPER service (Juanjo Marron via jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10ad39cf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10ad39cf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10ad39cf
Branch: refs/heads/trunk
Commit: 10ad39cfd87a2f11bdfbc3470fdf112bf1d83c1c
Parents: 3e45c8f
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Tue May 31 20:07:39 2016 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Tue May 31 20:07:39 2016 -0700
----------------------------------------------------------------------
.../ZOOKEEPER/3.4.5/package/scripts/params_windows.py | 3 ++-
.../ZOOKEEPER/3.4.5/package/scripts/service_check.py | 5 ++++-
.../ZOOKEEPER/3.4.5/package/scripts/zookeeper.py | 10 ++++++----
.../ZOOKEEPER/3.4.5/package/scripts/zookeeper_client.py | 10 +++++-----
.../ZOOKEEPER/3.4.5/package/scripts/zookeeper_service.py | 9 +++++----
5 files changed, 22 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/10ad39cf/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_windows.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_windows.py
index c36e152..a83214d 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_windows.py
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_windows.py
@@ -19,7 +19,8 @@ Ambari Agent
"""
from ambari_commons.str_utils import ensure_double_backslashes
-from resource_management import *
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions import is_empty
import status_params
# server configurations
http://git-wip-us.apache.org/repos/asf/ambari/blob/10ad39cf/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/service_check.py
index 622a5eb..b7c7758 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/service_check.py
@@ -19,7 +19,10 @@ Ambari Agent
"""
-from resource_management import *
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions.format import format
+from resource_management.core.resources.system import Execute, File
+from resource_management.core.source import StaticFile
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
http://git-wip-us.apache.org/repos/asf/ambari/blob/10ad39cf/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper.py
index e0ba54b..18e423c 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper.py
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper.py
@@ -21,12 +21,14 @@ Ambari Agent
import os
import sys
-from resource_management import *
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import stack_select
-from resource_management.libraries.functions import StackFeature
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions import conf_select,stack_select
+from resource_management.libraries.functions.constants import StackFeature
from resource_management.libraries.functions.version import compare_versions, format_stack_version
from resource_management.libraries.functions.stack_features import check_stack_feature
+from resource_management.core.resources.system import Directory, File
+from resource_management.core.resources.service import ServiceConfig
+from resource_management.core.source import InlineTemplate, Template
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
http://git-wip-us.apache.org/repos/asf/ambari/blob/10ad39cf/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_client.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_client.py
index de4d6e1..fac92e1 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_client.py
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_client.py
@@ -20,13 +20,13 @@ Ambari Agent
"""
import sys
-from resource_management import *
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import stack_select
-from resource_management.libraries.functions import StackFeature
-from resource_management.libraries.functions.version import compare_versions, format_stack_version
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions import conf_select, stack_select
+from resource_management.libraries.functions.constants import StackFeature
+from resource_management.libraries.functions.version import format_stack_version
from resource_management.libraries.functions.format import format
from resource_management.libraries.functions.stack_features import check_stack_feature
+from resource_management.core.logger import Logger
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
http://git-wip-us.apache.org/repos/asf/ambari/blob/10ad39cf/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_service.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_service.py
index 9f943d7..5069396 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_service.py
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_service.py
@@ -20,15 +20,16 @@ Ambari Agent
"""
import os
-from resource_management import *
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import stack_select
-from resource_management.libraries.functions import StackFeature
+from resource_management.libraries.functions import conf_select, stack_select
+from resource_management.libraries.functions.format import format
+from resource_management.libraries.functions.constants import StackFeature
from resource_management.libraries.functions.version import compare_versions, format_stack_version
from resource_management.libraries.functions.stack_features import check_stack_feature
from resource_management.libraries.functions.show_logs import show_logs
+from resource_management.core.resources.system import Execute, File
+from resource_management.core.resources.service import Service
@OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
def zookeeper_service(action='start', upgrade_type=None):