Repository: ambari Updated Branches: refs/heads/trunk 0aa21bc02 -> 5b2863cd7
AMBARI-16408: clean up import * for HBase 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/5b2863cd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5b2863cd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5b2863cd Branch: refs/heads/trunk Commit: 5b2863cd7faec2c71de87c5bbeeb480819632650 Parents: 0aa21bc Author: Jayush Luniya <[email protected]> Authored: Thu May 19 14:48:40 2016 -0700 Committer: Jayush Luniya <[email protected]> Committed: Thu May 19 14:48:40 2016 -0700 ---------------------------------------------------------------------- .../HBASE/0.96.0.2.0/package/scripts/hbase.py | 9 ++++++++- .../HBASE/0.96.0.2.0/package/scripts/hbase_client.py | 7 +++---- .../0.96.0.2.0/package/scripts/hbase_decommission.py | 5 +++-- .../HBASE/0.96.0.2.0/package/scripts/hbase_master.py | 3 ++- .../0.96.0.2.0/package/scripts/hbase_regionserver.py | 3 ++- .../HBASE/0.96.0.2.0/package/scripts/hbase_service.py | 5 ++++- .../HBASE/0.96.0.2.0/package/scripts/hbase_upgrade.py | 1 + .../HBASE/0.96.0.2.0/package/scripts/params_windows.py | 2 +- .../HBASE/0.96.0.2.0/package/scripts/service_check.py | 5 ++++- .../HBASE/0.96.0.2.0/package/scripts/upgrade.py | 11 +++++++---- 10 files changed, 35 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5b2863cd/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py index d2f28f5..8467fc5 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py @@ -18,8 +18,15 @@ limitations under the License. """ import os -from resource_management import * import sys +from resource_management.libraries.script.script import Script +from resource_management.libraries.resources.xml_config import XmlConfig +from resource_management.libraries.resources.template_config import TemplateConfig +from resource_management.libraries.functions.format import format +from resource_management.core.source import Template, InlineTemplate +from resource_management.core.resources import Package +from resource_management.core.resources.service import ServiceConfig +from resource_management.core.resources.system import Directory, 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/5b2863cd/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py index f35a570..f8c33dd 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py @@ -19,10 +19,9 @@ 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 hbase import hbase from ambari_commons import OSCheck, OSConst http://git-wip-us.apache.org/repos/asf/ambari/blob/5b2863cd/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_decommission.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_decommission.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_decommission.py index 022465a..7358674 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_decommission.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_decommission.py @@ -17,8 +17,9 @@ See the License for the specific language governing permissions and 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 from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl from ambari_commons import OSConst http://git-wip-us.apache.org/repos/asf/ambari/blob/5b2863cd/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py index 840411f..f63886e 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_master.py @@ -19,7 +19,8 @@ limitations under the License. """ import sys -from resource_management import * +from resource_management.libraries.script.script import Script +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 http://git-wip-us.apache.org/repos/asf/ambari/blob/5b2863cd/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py index 4001912..3376ac9 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py @@ -19,7 +19,8 @@ limitations under the License. """ import sys -from resource_management import * +from resource_management.libraries.script.script import Script +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 http://git-wip-us.apache.org/repos/asf/ambari/blob/5b2863cd/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py index a6904f6..e9e8803 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py @@ -18,7 +18,10 @@ limitations under the License. """ -from resource_management import * +from resource_management.libraries.functions.format import format +from resource_management.libraries.functions.show_logs import show_logs +from resource_management.core.shell import as_sudo +from resource_management.core.resources.system import Execute, File def hbase_service( name, http://git-wip-us.apache.org/repos/asf/ambari/blob/5b2863cd/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_upgrade.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_upgrade.py index 2dc9883..e5bb781 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_upgrade.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_upgrade.py @@ -20,6 +20,7 @@ limitations under the License. import sys from resource_management.libraries.script import Script +from resource_management.libraries.functions.format import format from resource_management.core.resources.system import Execute class HbaseMasterUpgrade(Script): http://git-wip-us.apache.org/repos/asf/ambari/blob/5b2863cd/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_windows.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_windows.py index 7d634cb..ddc9e93 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_windows.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_windows.py @@ -18,9 +18,9 @@ limitations under the License. """ -from resource_management import * import os import status_params +from resource_management.libraries.script.script import Script # server configurations config = Script.get_config() http://git-wip-us.apache.org/repos/asf/ambari/blob/5b2863cd/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py index a440c10..6f6045c 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py @@ -18,8 +18,11 @@ limitations under the License. """ -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 resource_management.core.source import Template import functions from ambari_commons import OSCheck, OSConst from ambari_commons.os_family_impl import OsFamilyImpl http://git-wip-us.apache.org/repos/asf/ambari/blob/5b2863cd/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/upgrade.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/upgrade.py index b1a19e6..f1fa80c 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/upgrade.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/upgrade.py @@ -18,15 +18,18 @@ See the License for the specific language governing permissions and limitations under the License. """ -from resource_management import * +import re from resource_management.core import shell -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.core.exceptions import Fail +from resource_management.core.logger import Logger +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.decorator import retry +from resource_management.libraries.functions.format import format from resource_management.libraries.functions import check_process_status + def prestart(env, stack_component): import params
