Repository: ambari Updated Branches: refs/heads/trunk 316a1811f -> f4fbab135
AMBARI-16916: clean up import * for SPARK2 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/f4fbab13 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4fbab13 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4fbab13 Branch: refs/heads/trunk Commit: f4fbab1353a739622dd89f6a4275b9dffcad9e9c Parents: 316a181 Author: Jayush Luniya <[email protected]> Authored: Thu Jun 9 10:45:49 2016 -0700 Committer: Jayush Luniya <[email protected]> Committed: Thu Jun 9 10:45:49 2016 -0700 ---------------------------------------------------------------------- .../SPARK2/2.0.0/package/scripts/job_history_server.py | 5 ++--- .../SPARK2/2.0.0/package/scripts/params.py | 13 +++++-------- .../SPARK2/2.0.0/package/scripts/service_check.py | 1 - .../SPARK2/2.0.0/package/scripts/setup_spark.py | 9 +++++++-- .../SPARK2/2.0.0/package/scripts/spark_client.py | 7 +++---- .../SPARK2/2.0.0/package/scripts/spark_service.py | 2 +- .../2.0.0/package/scripts/spark_thrift_server.py | 5 ++--- .../SPARK2/2.0.0/package/scripts/status_params.py | 2 +- 8 files changed, 21 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f4fbab13/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py index b3720f0..611c063 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py @@ -22,12 +22,11 @@ import sys import os from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select -from resource_management.libraries.functions import stack_select +from resource_management.libraries.functions import conf_select, stack_select from resource_management.libraries.functions.copy_tarball import copy_to_hdfs from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.libraries.functions.stack_features import check_stack_feature -from resource_management.libraries.functions import StackFeature +from resource_management.libraries.functions.constants import StackFeature from resource_management.core.logger import Logger from resource_management.core import shell from setup_spark import * http://git-wip-us.apache.org/repos/asf/ambari/blob/f4fbab13/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py index 3316f78..6925ab5 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py @@ -20,20 +20,17 @@ limitations under the License. import status_params -from resource_management.libraries.functions.stack_features import check_stack_feature -from resource_management.libraries.functions import StackFeature from setup_spark import * - -import resource_management.libraries.functions -from resource_management.libraries.functions import conf_select -from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions import format +from resource_management.libraries.functions.stack_features import check_stack_feature +from resource_management.libraries.functions.constants import StackFeature +from resource_management.libraries.functions import conf_select, stack_select from resource_management.libraries.functions.get_stack_version import get_stack_version from resource_management.libraries.functions.version import format_stack_version +from resource_management.libraries.functions.format import format from resource_management.libraries.functions.default import default from resource_management.libraries.functions import get_kinit_path from resource_management.libraries.functions.get_not_managed_resources import get_not_managed_resources - +from resource_management.libraries.resources.hdfs_resource import HdfsResource from resource_management.libraries.script.script import Script # a map of the Ambari role to the component name http://git-wip-us.apache.org/repos/asf/ambari/blob/f4fbab13/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/service_check.py index 694f046..565f924 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/service_check.py @@ -18,7 +18,6 @@ limitations under the License. import subprocess import time -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 http://git-wip-us.apache.org/repos/asf/ambari/blob/f4fbab13/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/setup_spark.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/setup_spark.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/setup_spark.py index 9316ba9..6b2c915 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/setup_spark.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/setup_spark.py @@ -22,13 +22,18 @@ import sys import fileinput import shutil import os -from resource_management import * + from resource_management.core.exceptions import ComponentIsNotRunning from resource_management.core.logger import Logger from resource_management.core import shell +from resource_management.core.source import InlineTemplate +from resource_management.core.resources.system import Directory, File +from resource_management.libraries.resources.properties_file import PropertiesFile from resource_management.libraries.functions.version import format_stack_version from resource_management.libraries.functions.stack_features import check_stack_feature -from resource_management.libraries.functions import StackFeature +from resource_management.libraries.functions.constants import StackFeature +from resource_management.libraries.functions.format import format +from resource_management.libraries.resources.xml_config import XmlConfig def setup_spark(env, type, upgrade_type = None, action = None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/f4fbab13/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py index 434b4b1..2c19b88 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py @@ -19,11 +19,10 @@ limitations under the License. """ 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.script.script import Script +from resource_management.libraries.functions import conf_select, stack_select from resource_management.libraries.functions.stack_features import check_stack_feature -from resource_management.libraries.functions import StackFeature +from resource_management.libraries.functions.constants import StackFeature from resource_management.core.exceptions import ClientComponentHasNoStatus from resource_management.core.logger import Logger from resource_management.core import shell http://git-wip-us.apache.org/repos/asf/ambari/blob/f4fbab13/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py index 2eae3e7..c2385df 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py @@ -29,7 +29,7 @@ from resource_management.libraries.functions import format from resource_management.core.resources.system import File, Execute from resource_management.libraries.functions.version import format_stack_version from resource_management.libraries.functions.stack_features import check_stack_feature -from resource_management.libraries.functions import StackFeature +from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.show_logs import show_logs http://git-wip-us.apache.org/repos/asf/ambari/blob/f4fbab13/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py index be65986..7f33939 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py @@ -22,10 +22,9 @@ import sys import os from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select -from resource_management.libraries.functions import stack_select +from resource_management.libraries.functions import conf_select, stack_select from resource_management.libraries.functions.stack_features import check_stack_feature -from resource_management.libraries.functions import StackFeature +from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.core.logger import Logger from resource_management.core import shell http://git-wip-us.apache.org/repos/asf/ambari/blob/f4fbab13/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/status_params.py index 4196638..2b6aafa 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/status_params.py @@ -18,7 +18,7 @@ limitations under the License. """ -from resource_management.libraries.functions import format +from resource_management.libraries.functions.format import format from resource_management.libraries.script.script import Script from resource_management.libraries.functions.default import default
