Repository: ambari Updated Branches: refs/heads/trunk ae1369742 -> 8d3570f8a
AMBARI-21463. FIXING MERGE ERROR. Cross-stack upgrade, Oozie restart fails with ext-2.2.zip missing error, stack_tools.py is missing get_stack_name in __all__, disable BigInsights in UI (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8d3570f8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8d3570f8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8d3570f8 Branch: refs/heads/trunk Commit: 8d3570f8aba559741d4e45da425eda3613c8d405 Parents: ae13697 Author: Alejandro Fernandez <afernan...@hortonworks.com> Authored: Thu Jul 27 15:16:25 2017 -0700 Committer: Alejandro Fernandez <afernan...@hortonworks.com> Committed: Thu Jul 27 15:16:25 2017 -0700 ---------------------------------------------------------------------- .../common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py | 8 ++++---- .../OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8d3570f8/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py index 3467ed2..695395a 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py @@ -52,7 +52,7 @@ from ambari_commons.inet_utils import download_file from resource_management.core import Logger @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY) -def oozie(is_server=False): +def oozie(is_server=False, upgrade_type=None): import params from status_params import oozie_server_win_service_name @@ -99,7 +99,7 @@ def oozie(is_server=False): # TODO: see if see can remove this @OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT) -def oozie(is_server=False): +def oozie(is_server=False, upgrade_type=None): import params if is_server: @@ -189,8 +189,8 @@ def oozie(is_server=False): oozie_ownership() - if is_server: - oozie_server_specific() + if is_server: + oozie_server_specific(upgrade_type) def oozie_ownership(): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/8d3570f8/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py index 3edb042..23b39ef 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py @@ -41,7 +41,7 @@ BACKUP_CONF_ARCHIVE = "oozie-conf-backup.tar" class OozieUpgrade(Script): @staticmethod - def prepare_libext_directory(): + def prepare_libext_directory(upgrade_type=None): """ Performs the following actions on libext: - creates <stack-root>/current/oozie/libext and recursively
