Repository: ambari Updated Branches: refs/heads/trunk 9e98dc039 -> 0aa21bc02
AMBARI-16362: clean up import * for HDFS service scripts in common-services (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/0aa21bc0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0aa21bc0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0aa21bc0 Branch: refs/heads/trunk Commit: 0aa21bc02822f83ce14f806fc2cb543c66af2f07 Parents: 9e98dc0 Author: Jayush Luniya <[email protected]> Authored: Thu May 19 14:34:11 2016 -0700 Committer: Jayush Luniya <[email protected]> Committed: Thu May 19 14:34:29 2016 -0700 ---------------------------------------------------------------------- .../HDFS/2.1.0.2.0/package/scripts/datanode.py | 8 ++++---- .../HDFS/2.1.0.2.0/package/scripts/hdfs.py | 7 ++++++- .../HDFS/2.1.0.2.0/package/scripts/hdfs_client.py | 7 +++---- .../HDFS/2.1.0.2.0/package/scripts/hdfs_datanode.py | 3 ++- .../HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py | 3 ++- .../HDFS/2.1.0.2.0/package/scripts/journalnode.py | 10 +++++----- .../HDFS/2.1.0.2.0/package/scripts/namenode.py | 2 +- .../HDFS/2.1.0.2.0/package/scripts/params_windows.py | 3 +++ .../HDFS/2.1.0.2.0/package/scripts/service_check.py | 8 +++++++- .../HDFS/2.1.0.2.0/package/scripts/snamenode.py | 7 +++---- .../HDFS/2.1.0.2.0/package/scripts/utils.py | 1 - 11 files changed, 36 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0aa21bc0/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode.py index 79c32e4..c12ba0c 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode.py @@ -18,13 +18,13 @@ limitations under the License. """ import datanode_upgrade from hdfs_datanode import datanode -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.stack_features import check_stack_feature from resource_management.libraries.functions.security_commons import build_expectations, \ cached_kinit_executor, get_params_from_filesystem, validate_security_config_properties, FILE_TYPE_XML +from resource_management.core.logger import Logger from hdfs import hdfs from ambari_commons.os_family_impl import OsFamilyImpl from ambari_commons import OSConst http://git-wip-us.apache.org/repos/asf/ambari/blob/0aa21bc0/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py index 1264284..d9b62e2 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py @@ -19,7 +19,12 @@ Ambari Agent """ -from resource_management import * +from resource_management.libraries.script.script import Script +from resource_management.core.resources.system import Directory, File, Link +from resource_management.core.resources import Package +from resource_management.core.source import Template +from resource_management.core.resources.service import ServiceConfig +from resource_management.libraries.resources.xml_config import XmlConfig import os from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl from ambari_commons import OSConst http://git-wip-us.apache.org/repos/asf/ambari/blob/0aa21bc0/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_client.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_client.py index d9b76b8..93d244d 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_client.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_client.py @@ -17,10 +17,9 @@ limitations under the License. """ -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.stack_features import check_stack_feature from resource_management.libraries.functions.security_commons import build_expectations, \ cached_kinit_executor, get_params_from_filesystem, validate_security_config_properties, \ http://git-wip-us.apache.org/repos/asf/ambari/blob/0aa21bc0/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_datanode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_datanode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_datanode.py index a22fb99..2ca2e1e 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_datanode.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_datanode.py @@ -17,7 +17,8 @@ limitations under the License. """ import os -from resource_management import * +from resource_management.core.resources.system import Directory, Execute, File +from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.libraries.functions.dfs_datanode_helper import handle_dfs_data_dir from utils import service from ambari_commons.os_family_impl import OsFamilyImpl, OsFamilyFuncImpl http://git-wip-us.apache.org/repos/asf/ambari/blob/0aa21bc0/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py index 500ed15..3421053 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py @@ -17,8 +17,9 @@ limitations under the License. """ -from resource_management import * from utils import service +from resource_management.core.resources.system import Directory, File +from resource_management.core.source import Template from ambari_commons.os_family_impl import OsFamilyImpl, OsFamilyFuncImpl from ambari_commons import OSConst http://git-wip-us.apache.org/repos/asf/ambari/blob/0aa21bc0/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/journalnode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/journalnode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/journalnode.py index 9c5a124..091997e 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/journalnode.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/journalnode.py @@ -17,16 +17,16 @@ limitations under the License. """ -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.stack_features import check_stack_feature from resource_management.libraries.functions.format import format from resource_management.libraries.functions.security_commons import build_expectations, \ cached_kinit_executor, get_params_from_filesystem, validate_security_config_properties, \ FILE_TYPE_XML - +from resource_management.core.logger import Logger +from resource_management.core.resources.system import Directory from utils import service from hdfs import hdfs import journalnode_upgrade http://git-wip-us.apache.org/repos/asf/ambari/blob/0aa21bc0/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py index b37f413..df02311 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py @@ -25,7 +25,7 @@ import tempfile from datetime import datetime import ambari_simplejson as json # simplejson is much faster comparing to Python 2.6 json module and has the same functions set. -from resource_management import Script +from resource_management.libraries.script.script import Script from resource_management.core.resources.system import Execute, File from resource_management.core import shell from resource_management.libraries.functions import conf_select http://git-wip-us.apache.org/repos/asf/ambari/blob/0aa21bc0/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py index da00985..70d95a6 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py @@ -20,6 +20,9 @@ limitations under the License. import os #Used in subsequent imports from params +from resource_management.libraries.script.script import Script +from resource_management.libraries.functions.default import default +from resource_management.libraries.functions.format import format from install_params import exclude_packages from status_params import * http://git-wip-us.apache.org/repos/asf/ambari/blob/0aa21bc0/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py index 737ae04..981f002 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py @@ -17,12 +17,18 @@ limitations under the License. """ -from resource_management import * +from resource_management.libraries.script.script import Script from resource_management.core.shell import as_user from ambari_commons.os_family_impl import OsFamilyImpl from ambari_commons import OSConst from resource_management.libraries.functions.curl_krb_request import curl_krb_request +from resource_management.libraries import functions +from resource_management.libraries.functions.format import format +from resource_management.libraries.resources.execute_hadoop import ExecuteHadoop from resource_management.core.logger import Logger +from resource_management.core.source import StaticFile +from resource_management.core.resources.system import Execute, File + class HdfsServiceCheck(Script): pass http://git-wip-us.apache.org/repos/asf/ambari/blob/0aa21bc0/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py index 30eee07..318b449 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py @@ -17,10 +17,9 @@ limitations under the License. """ -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.stack_features import check_stack_feature from resource_management.libraries.functions.security_commons import build_expectations, \ cached_kinit_executor, get_params_from_filesystem, validate_security_config_properties, \ http://git-wip-us.apache.org/repos/asf/ambari/blob/0aa21bc0/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py index ceee738..f552f7d 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py @@ -33,7 +33,6 @@ from resource_management.core.logger import Logger from resource_management.libraries.functions.curl_krb_request import curl_krb_request from resource_management.core.exceptions import Fail from resource_management.libraries.functions.namenode_ha_utils import get_namenode_states -from resource_management.libraries.script.script import Script from resource_management.libraries.functions.show_logs import show_logs from zkfc_slave import ZkfcSlave
