Yeela Kaplan has uploaded a new change for review.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
init: configure multipath on upgrade from ovirt-3.5
multipath configurator was added to vdsm-tool in ovirt-3.6. In case we upgrade from ovirt-3.5 we now run configure of module multipath in init script.
Change-Id: Ifbebdebb6bda25606b20d91804977fa8eb7f13e8 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1276736 Signed-off-by: Yeela Kaplan ykaplan@redhat.com --- M init/vdsmd_init_common.sh.in 1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/47941/1
diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in index 00e4054..62e81bd 100644 --- a/init/vdsmd_init_common.sh.in +++ b/init/vdsmd_init_common.sh.in @@ -259,6 +259,11 @@ # by running manual configure command "$VDSM_TOOL" configure --force ret=$? + elif grep -q '^vdsm-4.16.' "${upgraded_ver_file}"; then + # We need to treat the upgrade from 4.16.x specifically + # by running manual multipath configure command + "$VDSM_TOOL" configure --module multipath + ret=$? fi [ "${ret}" -eq 0 ] && rm -f "${upgraded_ver_file}" fi
automation@ovirt.org has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 1:
* Update tracker::#1276736::OK * Check Bug-Url::OK * Check Public Bug::#1276736::OK, public bug * Check Product::#1276736::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Yeela Kaplan has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 1: Verified+1
Yeela Kaplan has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 1:
Upgrade from vdsm-4.16 completes successfully. multipath is configured after upgrade and vdsm starts successfully.
Oved Ourfali has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 1: Code-Review+1
Dan Kenigsberg has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 1: Code-Review+1
Yaniv Bronhaim has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 1: Code-Review-1
(2 comments)
second ...
https://gerrit.ovirt.org/#/c/47941/1/init/vdsmd_init_common.sh.in File init/vdsmd_init_common.sh.in:
Line 256: local ret=0 Line 257: if grep -q '^vdsm-4.10.' "${upgraded_ver_file}"; then Line 258: # We need to treat the upgrade from 4.10.x specifically Line 259: # by running manual configure command Line 260: "$VDSM_TOOL" configure --force we should remove that. we need to add the REQUIRED_FOR here Line 261: ret=$? Line 262: elif grep -q '^vdsm-4.16.' "${upgraded_ver_file}"; then Line 263: # We need to treat the upgrade from 4.16.x specifically Line 264: # by running manual multipath configure command
Line 261: ret=$? Line 262: elif grep -q '^vdsm-4.16.' "${upgraded_ver_file}"; then Line 263: # We need to treat the upgrade from 4.16.x specifically Line 264: # by running manual multipath configure command Line 265: "$VDSM_TOOL" configure --module multipath don't we want to configure all if we already do that? and then you can merge the conditions? Line 266: ret=$? Line 267: fi Line 268: [ "${ret}" -eq 0 ] && rm -f "${upgraded_ver_file}" Line 269: fi
Dan Kenigsberg has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 1:
(2 comments)
https://gerrit.ovirt.org/#/c/47941/1/init/vdsmd_init_common.sh.in File init/vdsmd_init_common.sh.in:
Line 256: local ret=0 Line 257: if grep -q '^vdsm-4.10.' "${upgraded_ver_file}"; then Line 258: # We need to treat the upgrade from 4.10.x specifically Line 259: # by running manual configure command Line 260: "$VDSM_TOOL" configure --force
we should remove that. we need to add the REQUIRED_FOR here
Correct.
# REQUIRED_FOR upgrade from vdsm-4.16.z
is the standard way to say this. Line 261: ret=$? Line 262: elif grep -q '^vdsm-4.16.' "${upgraded_ver_file}"; then Line 263: # We need to treat the upgrade from 4.16.x specifically Line 264: # by running manual multipath configure command
Line 261: ret=$? Line 262: elif grep -q '^vdsm-4.16.' "${upgraded_ver_file}"; then Line 263: # We need to treat the upgrade from 4.16.x specifically Line 264: # by running manual multipath configure command Line 265: "$VDSM_TOOL" configure --module multipath
don't we want to configure all if we already do that? and then you can merg
if we can avoid restarting libvirtd, I think that we should. Line 266: ret=$? Line 267: fi Line 268: [ "${ret}" -eq 0 ] && rm -f "${upgraded_ver_file}" Line 269: fi
Yaniv Bronhaim has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 1:
(1 comment)
https://gerrit.ovirt.org/#/c/47941/1/init/vdsmd_init_common.sh.in File init/vdsmd_init_common.sh.in:
Line 261: ret=$? Line 262: elif grep -q '^vdsm-4.16.' "${upgraded_ver_file}"; then Line 263: # We need to treat the upgrade from 4.16.x specifically Line 264: # by running manual multipath configure command Line 265: "$VDSM_TOOL" configure --module multipath
if we can avoid restarting libvirtd, I think that we should.
mmm right ... iirc --force won't configure libvirt if its already configured. anyhow - without --force also multipath will not be configured if it runs Line 266: ret=$? Line 267: fi Line 268: [ "${ret}" -eq 0 ] && rm -f "${upgraded_ver_file}" Line 269: fi
Yaniv Bronhaim has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 1:
(1 comment)
https://gerrit.ovirt.org/#/c/47941/1/init/vdsmd_init_common.sh.in File init/vdsmd_init_common.sh.in:
Line 261: ret=$? Line 262: elif grep -q '^vdsm-4.16.' "${upgraded_ver_file}"; then Line 263: # We need to treat the upgrade from 4.16.x specifically Line 264: # by running manual multipath configure command Line 265: "$VDSM_TOOL" configure --module multipath
mmm right ... iirc --force won't configure libvirt if its already configure
ok, checked it - libvirt will restart if we run configure --force. if sanlock config or sebool config won't change between 3.5 to 3.6 we're safe. so I agree to keep it only to multipath. Line 266: ret=$? Line 267: fi Line 268: [ "${ret}" -eq 0 ] && rm -f "${upgraded_ver_file}" Line 269: fi
Yeela Kaplan has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 1:
(2 comments)
https://gerrit.ovirt.org/#/c/47941/1/init/vdsmd_init_common.sh.in File init/vdsmd_init_common.sh.in:
Line 256: local ret=0 Line 257: if grep -q '^vdsm-4.10.' "${upgraded_ver_file}"; then Line 258: # We need to treat the upgrade from 4.10.x specifically Line 259: # by running manual configure command Line 260: "$VDSM_TOOL" configure --force
Correct.
Done Line 261: ret=$? Line 262: elif grep -q '^vdsm-4.16.' "${upgraded_ver_file}"; then Line 263: # We need to treat the upgrade from 4.16.x specifically Line 264: # by running manual multipath configure command
Line 256: local ret=0 Line 257: if grep -q '^vdsm-4.10.' "${upgraded_ver_file}"; then Line 258: # We need to treat the upgrade from 4.10.x specifically Line 259: # by running manual configure command Line 260: "$VDSM_TOOL" configure --force
we should remove that. we need to add the REQUIRED_FOR here
Can you explain what do you mean? I don't understand your comment... Line 261: ret=$? Line 262: elif grep -q '^vdsm-4.16.' "${upgraded_ver_file}"; then Line 263: # We need to treat the upgrade from 4.16.x specifically Line 264: # by running manual multipath configure command
Yeela Kaplan has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 1:
(1 comment)
https://gerrit.ovirt.org/#/c/47941/1/init/vdsmd_init_common.sh.in File init/vdsmd_init_common.sh.in:
Line 256: local ret=0 Line 257: if grep -q '^vdsm-4.10.' "${upgraded_ver_file}"; then Line 258: # We need to treat the upgrade from 4.10.x specifically Line 259: # by running manual configure command Line 260: "$VDSM_TOOL" configure --force
Can you explain what do you mean?
Please ignore the latest comment... :) Line 261: ret=$? Line 262: elif grep -q '^vdsm-4.16.' "${upgraded_ver_file}"; then Line 263: # We need to treat the upgrade from 4.16.x specifically Line 264: # by running manual multipath configure command
automation@ovirt.org has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 2:
* Update tracker::#1276736::OK * Check Bug-Url::OK * Check Public Bug::#1276736::OK, public bug * Check Product::#1276736::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Dan Kenigsberg has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 2: Code-Review+2
Yaniv Bronhaim has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 2: Code-Review+1
I was wrong - force is not required in multipath specifically thanks to the call to "service reload" after changing multipath.conf
Yeela Kaplan has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 2: Verified+1
Dan Kenigsberg has submitted this change and it was merged.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
init: configure multipath on upgrade from ovirt-3.5
multipath configurator was added to vdsm-tool in ovirt-3.6. In case we upgrade from ovirt-3.5 we now run configure of module multipath in init script.
Change-Id: Ifbebdebb6bda25606b20d91804977fa8eb7f13e8 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1276736 Signed-off-by: Yeela Kaplan ykaplan@redhat.com Reviewed-on: https://gerrit.ovirt.org/47941 Reviewed-by: Dan Kenigsberg danken@redhat.com Reviewed-by: Yaniv Bronhaim ybronhei@redhat.com Continuous-Integration: Jenkins CI --- M init/vdsmd_init_common.sh.in 1 file changed, 4 insertions(+), 0 deletions(-)
Approvals: Yeela Kaplan: Verified Yaniv Bronhaim: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved
automation@ovirt.org has posted comments on this change.
Change subject: init: configure multipath on upgrade from ovirt-3.5 ......................................................................
Patch Set 3:
* Update tracker::#1276736::OK * Set MODIFIED::bug 1276736::::#1276736::::IGNORE, not oVirt prod but vdsm
vdsm-patches@lists.fedorahosted.org