Repository: ambari Updated Branches: refs/heads/trunk f8b427494 -> fb3afc6a0
AMBARI-16189: clean up import * for Hive 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/fb3afc6a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb3afc6a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb3afc6a Branch: refs/heads/trunk Commit: fb3afc6a0214fad2971e55a44c98c93236a9b933 Parents: f8b4274 Author: Jayush Luniya <[email protected]> Authored: Thu May 19 14:30:39 2016 -0700 Committer: Jayush Luniya <[email protected]> Committed: Thu May 19 14:30:39 2016 -0700 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/scripts/hcat.py | 5 ++++- .../HIVE/0.12.0.2.0/package/scripts/hcat_client.py | 2 +- .../HIVE/0.12.0.2.0/package/scripts/hcat_service_check.py | 5 ++++- .../HIVE/0.12.0.2.0/package/scripts/hive_client.py | 8 ++++---- .../HIVE/0.12.0.2.0/package/scripts/hive_interactive.py | 5 ++--- .../HIVE/0.12.0.2.0/package/scripts/hive_service.py | 1 - .../HIVE/0.12.0.2.0/package/scripts/mysql_server.py | 3 +-- .../HIVE/0.12.0.2.0/package/scripts/mysql_service.py | 4 +++- .../HIVE/0.12.0.2.0/package/scripts/mysql_users.py | 4 +++- .../HIVE/0.12.0.2.0/package/scripts/mysql_utils.py | 2 +- .../HIVE/0.12.0.2.0/package/scripts/params_windows.py | 3 ++- .../HIVE/0.12.0.2.0/package/scripts/service_check.py | 7 ++++++- .../HIVE/0.12.0.2.0/package/scripts/webhcat.py | 10 +++++++--- .../HIVE/0.12.0.2.0/package/scripts/webhcat_server.py | 8 ++++---- .../HIVE/0.12.0.2.0/package/scripts/webhcat_service.py | 6 +++++- .../0.12.0.2.0/package/scripts/webhcat_service_check.py | 7 ++++++- 16 files changed, 53 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat.py index 45dcbe7..839ab04 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat.py @@ -18,8 +18,11 @@ limitations under the License. """ -from resource_management import * import sys +from resource_management.libraries.resources.xml_config import XmlConfig +from resource_management.libraries.functions.format import format +from resource_management.core.resources.system import Directory, File +from resource_management.core.source import InlineTemplate from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl from ambari_commons import OSConst http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py index b37698e..47bbc41 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_client.py @@ -24,7 +24,7 @@ from ambari_commons.os_family_impl import OsFamilyImpl from resource_management.core.logger import Logger from resource_management.core.exceptions import ClientComponentHasNoStatus from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions import StackFeature +from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.script.script import Script http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_service_check.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_service_check.py index 07b4095..386a0a0 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_service_check.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_service_check.py @@ -19,8 +19,11 @@ limitations under the License. """ import os -from resource_management import * from resource_management.libraries.functions import get_unique_id_and_date +from resource_management.libraries.functions.format import format +from resource_management.libraries.resources.execute_hadoop import ExecuteHadoop +from resource_management.core.source import StaticFile +from resource_management.core.resources.system import Execute, File from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl from ambari_commons import OSConst http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_client.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_client.py index da49450..1f85fc0 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_client.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_client.py @@ -18,11 +18,11 @@ 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.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.core.logger import Logger from hive import hive from ambari_commons.os_family_impl import OsFamilyImpl from ambari_commons import OSConst http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py index ce949df..8e49cf0 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py @@ -31,13 +31,12 @@ from resource_management.libraries.functions import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions.version import compare_versions from resource_management.core.resources.service import ServiceConfig -from resource_management.core.resources.system import File, Execute, Directory -from resource_management.core.source import StaticFile, Template, DownloadSource, InlineTemplate +from resource_management.core.resources.system import File, Directory +from resource_management.core.source import Template, DownloadSource, InlineTemplate from resource_management.core.shell import as_user from resource_management.libraries.functions.is_empty import is_empty from resource_management.libraries.resources.xml_config import XmlConfig from resource_management.libraries.functions.format import format -from resource_management.core.exceptions import Fail from resource_management.core.shell import as_sudo from resource_management.core.shell import quote_bash_args from resource_management.core.logger import Logger http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py index a1ffc5e..a13b087 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py @@ -29,7 +29,6 @@ from resource_management.core.resources.system import File, Execute from resource_management.core.resources.service import Service from resource_management.core.exceptions import Fail from resource_management.core.shell import as_user -from resource_management.libraries.functions.hive_check import check_thrift_port_sasl from resource_management.libraries.functions import get_user_call_output from resource_management.libraries.functions.show_logs import show_logs from resource_management.libraries.functions import StackFeature http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py index 851dc02..d213aa1 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py @@ -21,8 +21,7 @@ limitations under the License. import sys import os import mysql_users -from resource_management import * - +from resource_management.libraries.script.script import Script from mysql_service import mysql_service from mysql_utils import mysql_configure http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py index 8b98ed1..7862774 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py @@ -18,7 +18,9 @@ limitations under the License. """ -from resource_management import * +from resource_management.core.resources.system import Execute +from resource_management.core.exceptions import ComponentIsNotRunning, Fail +from resource_management.libraries.functions.format import format def mysql_service(daemon_name=None, action='start'): http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_users.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_users.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_users.py index c023548..d34c2bc 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_users.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_users.py @@ -18,7 +18,9 @@ limitations under the License. """ -from resource_management import * +from resource_management.core.resources.system import Execute, File +from resource_management.core.source import StaticFile +from resource_management.libraries.functions.format import format # Used to add hive access to the needed components def mysql_adduser(): http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_utils.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_utils.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_utils.py index 5006b56..bb008df 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_utils.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_utils.py @@ -18,7 +18,7 @@ limitations under the License. """ -from resource_management import * +from resource_management.core.resources.system import Execute import mysql_users def mysql_configure(): http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_windows.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_windows.py index 880fdb5..3f32d66 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_windows.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_windows.py @@ -18,7 +18,8 @@ limitations under the License. """ -from resource_management import * +from resource_management.libraries.functions.version import format_stack_version +from resource_management.libraries.script.script import Script from status_params import * # server configurations http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/service_check.py index f7304f7..7c1e3ca 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/service_check.py @@ -18,7 +18,6 @@ limitations under the License. """ -from resource_management import * import socket import sys import time @@ -31,6 +30,12 @@ from ambari_commons.os_family_impl import OsFamilyImpl from resource_management.core import shell from resource_management.core.logger import Logger from resource_management.libraries.functions import get_unique_id_and_date +from resource_management.libraries.script.script import Script +from resource_management.libraries.functions.format import format +from resource_management.libraries.functions.hive_check import check_thrift_port_sasl +from resource_management.core.resources.system import Execute, File +from resource_management.core.exceptions import Fail +from resource_management.core.source import StaticFile class HiveServiceCheck(Script): http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py index 3acbc7b..816b6af 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py @@ -20,9 +20,13 @@ Ambari Agent """ import sys import os.path -from resource_management import * -from resource_management.core.resources.system import Execute -from resource_management.libraries.functions import StackFeature +from resource_management.core.resources.system import Directory, Execute, File +from resource_management.core.resources.service import ServiceConfig +from resource_management.core.source import InlineTemplate, StaticFile +from resource_management.libraries.script.script import Script +from resource_management.libraries.resources.xml_config import XmlConfig +from resource_management.libraries.functions.constants import StackFeature +from resource_management.libraries.functions.format import format from resource_management.libraries.functions.stack_features import check_stack_feature from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl from ambari_commons import OSConst http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py index 34687c4..08cb722 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_server.py @@ -18,14 +18,14 @@ limitations under the License. Ambari Agent """ -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 webhcat import webhcat from webhcat_service import webhcat_service from ambari_commons import OSConst http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py index c24db4c..973dd5b 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py @@ -18,11 +18,15 @@ limitations under the License. Ambari Agent """ -from resource_management import * from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl from ambari_commons import OSConst +from resource_management.core.resources.service import Service from resource_management.core.shell import as_user from resource_management.core.logger import Logger +from resource_management.core.exceptions import Fail +from resource_management.libraries.functions.format import format +from resource_management.libraries.functions.show_logs import show_logs +from resource_management.core.resources.system import Execute, File import traceback http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3afc6a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py index 8e80d48..71f930e 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py @@ -19,7 +19,12 @@ limitations under the License. """ import urllib2 -from resource_management import * +from resource_management.core.logger import Logger +from resource_management.core.exceptions import Fail +from resource_management.core.resources.system import Execute, File +from resource_management.core.source import StaticFile, Template +from resource_management.libraries.script.script import Script +from resource_management.libraries.functions.format import format from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl from ambari_commons import OSConst import time
