From Yaniv Bronhaim ybronhei@redhat.com:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: remove upgrade hacks for older versions ......................................................................
remove upgrade hacks for older versions
Change-Id: I7ec84b22905200f6189891785e4367889ce28bde Signed-off-by: Yaniv Bronhaim ybronhei@redhat.com --- M init/vdsmd_init_common.sh.in M vdsm.spec.in 2 files changed, 0 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/77780/1
diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in index cbec4a6..4e50ecb 100755 --- a/init/vdsmd_init_common.sh.in +++ b/init/vdsmd_init_common.sh.in @@ -195,24 +195,6 @@ }
-task_upgraded_version_check(){ - local upgraded_ver_file="@VDSMLIBDIR@/upgraded_version" - if [ -f "${upgraded_ver_file}" ]; then - local ret=0 - if grep -q '^vdsm-4.10.' "${upgraded_ver_file}"; then - # REQUIRED_FOR upgrade from vdsm-4.10.x - "$VDSM_TOOL" configure --force - ret=$? - elif grep -qE '^vdsm-4.(13|14|16).' "${upgraded_ver_file}"; then - # REQUIRED_FOR upgrade from 4.13.x or 4.14.x or 4.16.x - # mutlipath and sasl password configuration logic moved to - # vdsm-tool in 4.17. - "$VDSM_TOOL" configure --module multipath --module passwd - ret=$? - fi - [ "${ret}" -eq 0 ] && rm -f "${upgraded_ver_file}" - fi -} #### pre-start tasks end ####
@@ -250,7 +232,6 @@ configure_vdsm_logs \ wait_for_network \ run_init_hooks \ - upgraded_version_check \ check_is_configured \ validate_configuration \ prepare_transient_repository \ diff --git a/vdsm.spec.in b/vdsm.spec.in index 6936958..1798d33 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -772,7 +772,6 @@ /usr/sbin/usermod -a -G %{cdrom_group} %{qemu_user}
# We keep the previous rpm version number in a file for managing upgrade flow -# in vdsmd_init_script upgraded_version_check task if [ "$1" -gt 1 ]; then rpm -q %{vdsm_name} > "%{_localstatedir}/lib/%{vdsm_name}/upgraded_version" fi
From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has posted comments on this change.
Change subject: remove upgrade hacks for older versions ......................................................................
Patch Set 1:
please document why this is safe
From Yaniv Bronhaim ybronhei@redhat.com:
Yaniv Bronhaim has posted comments on this change.
Change subject: Remove upgrade hacks for vdsm version <=4.16 ......................................................................
Patch Set 2: Verified+1
From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Remove upgrade hacks for vdsm version <=4.16 ......................................................................
Remove upgrade hacks for vdsm version <=4.16
Before 4.17 we added few hacks (commits d4cce072 and e79dfe64) to allow smooth upgrade between versions while vdsmd service is running Since 4.20 (ovirt-4.2) we don't support upgrades from 4.16 to 4.20 so we can safetly remove those parts and use this logic for new hacks :) That's why this patch still leaves the upgrade file that is being created during vdsm upgrade.
Change-Id: I7ec84b22905200f6189891785e4367889ce28bde Signed-off-by: Yaniv Bronhaim ybronhei@redhat.com --- M init/vdsmd_init_common.sh.in M vdsm.spec.in 2 files changed, 0 insertions(+), 20 deletions(-)
Approvals: Piotr Kliczewski: Looks good to me, approved Yaniv Bronhaim: Verified Jenkins CI: Passed CI tests Irit Goihman: Looks good to me, but someone else must approve Edward Haas: Looks good to me, but someone else must approve
vdsm-patches@lists.fedorahosted.org