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/02 16:19:45 UTC
ambari git commit: AMBARI-16797: clean up import * for SPARK service
scripts in common-services ( Juanjo Marron via jluniya )
Repository: ambari
Updated Branches:
refs/heads/trunk 920f49c19 -> 37cab36f0
AMBARI-16797: clean up import * for SPARK 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/37cab36f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37cab36f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37cab36f
Branch: refs/heads/trunk
Commit: 37cab36f0e40a7ca968ab915b47bb65cb98d0841
Parents: 920f49c
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Thu Jun 2 09:19:38 2016 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Thu Jun 2 09:19:38 2016 -0700
----------------------------------------------------------------------
.../1.2.1/package/scripts/job_history_server.py | 5 ++---
.../SPARK/1.2.1/package/scripts/params.py | 15 +++++++--------
.../SPARK/1.2.1/package/scripts/service_check.py | 2 --
.../SPARK/1.2.1/package/scripts/setup_spark.py | 8 ++++++--
.../SPARK/1.2.1/package/scripts/spark_client.py | 7 +++----
.../1.2.1/package/scripts/spark_thrift_server.py | 5 ++---
.../SPARK/1.2.1/package/scripts/status_params.py | 2 +-
7 files changed, 21 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/37cab36f/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/job_history_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/job_history_server.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/job_history_server.py
index bccd714..e96edd4 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/job_history_server.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/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/37cab36f/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
index d01ba21..cd75839 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
@@ -20,22 +20,21 @@ 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 setup_spark import *
+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
# for use with <stack-root>/current/<component>
SERVER_ROLE_DIRECTORY_MAP = {
http://git-wip-us.apache.org/repos/asf/ambari/blob/37cab36f/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/service_check.py
index 694f046..fd9e122 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/service_check.py
@@ -18,11 +18,9 @@ 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
-from resource_management.core.logger import Logger
class SparkServiceCheck(Script):
def service_check(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/37cab36f/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_spark.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_spark.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_spark.py
index eca8534..51ec174 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_spark.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_spark.py
@@ -22,13 +22,17 @@ 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/37cab36f/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_client.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_client.py
index 3838061..ef41453 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_client.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/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/37cab36f/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_thrift_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_thrift_server.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_thrift_server.py
index 9311454..a0f000c 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_thrift_server.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/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/37cab36f/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/status_params.py
index 86e7f7d..a1365fe 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/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