Yaniv Bronhaim has uploaded a new change for review.
Change subject: Fixed %post script error during upgrade ......................................................................
Fixed %post script error during upgrade
During post script we initiates vdsm-tool set-saslpasswd call. On upgrade we have mixed code that may lead to an error while calling vdsm-tool script, as in the related bug. In this patch we move the call to set-saslpasswd to init scripts. In pre-script phase we can be sure that the newer code is running.
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1168689 Change-Id: Ib7808f4f217ba3d6d30a60fab6233e36a29f0098 Signed-off-by: Yaniv Bronhaim ybronhei@redhat.com --- M init/vdsmd_init_common.sh.in M vdsm.spec.in 2 files changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/35739/1
diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in index e637b59..9389e28 100644 --- a/init/vdsmd_init_common.sh.in +++ b/init/vdsmd_init_common.sh.in @@ -216,6 +216,10 @@ [ "${ret}" -eq 0 ] && rm -f "${upgraded_ver_file}" fi } + +task_set_sasl_password() { + "$VDSM_TOOL" set-saslpasswd +} #### pre-start tasks end ####
@@ -252,6 +256,7 @@ # after load_needed_modules (modprobe bonding). # NetworkManager must not crash on nmcli conn delete. run_tasks " \ + set_sasl_password \ mkdirs \ configure_coredump \ configure_vdsm_logs \ diff --git a/vdsm.spec.in b/vdsm.spec.in index 86a43c7..7dfaece 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -787,8 +787,6 @@
%post %{_bindir}/vdsm-tool configure --module sanlock --force >/dev/null -# set the vdsm "secret" password for libvirt -%{_bindir}/vdsm-tool set-saslpasswd
# After vdsm install we should create the logs files. # In the install session we create it but since we use
Yaniv Bronhaim has posted comments on this change.
Change subject: Fixed %post script error during upgrade ......................................................................
Patch Set 1: Verified+1
its cool and all, but should be part of vdsm-tool configure imo . later..
Dan Kenigsberg has posted comments on this change.
Change subject: Fixed %post script error during upgrade ......................................................................
Patch Set 1: Code-Review-1
(1 comment)
http://gerrit.ovirt.org/#/c/35739/1/init/vdsmd_init_common.sh.in File init/vdsmd_init_common.sh.in:
Line 255: # of added bonding options or tweaked kernel defaults) it has to be run Line 256: # after load_needed_modules (modprobe bonding). Line 257: # NetworkManager must not crash on nmcli conn delete. Line 258: run_tasks " \ Line 259: set_sasl_password \ why should we run this on every vdsm startup? calling it from within `vdsm-tool configure` makes more sense to me. Line 260: mkdirs \ Line 261: configure_coredump \ Line 262: configure_vdsm_logs \ Line 263: run_init_hooks \
Yaniv Bronhaim has posted comments on this change.
Change subject: Fixed %post script error during upgrade ......................................................................
Patch Set 1:
I know, but i won't make it today
Dan Kenigsberg has posted comments on this change.
Change subject: Fixed %post script error during upgrade ......................................................................
Patch Set 1: -Code-Review
Ok, but don't it slow vdsm start-up?
Yaniv Bronhaim has posted comments on this change.
Change subject: Fixed %post script error during upgrade ......................................................................
Patch Set 1:
no.. its quite fast
Dan Kenigsberg has posted comments on this change.
Change subject: Fixed %post script error during upgrade ......................................................................
Patch Set 1: Code-Review+2
Ok, accepting as an emergency fix to 3.5 upgrade.
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Fixed %post script error during upgrade ......................................................................
Fixed %post script error during upgrade
During post script we initiates vdsm-tool set-saslpasswd call. On upgrade we have mixed code that may lead to an error while calling vdsm-tool script, as in the related bug. In this patch we move the call to set-saslpasswd to init scripts. In pre-script phase we can be sure that the newer code is running.
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1168689 Change-Id: Ib7808f4f217ba3d6d30a60fab6233e36a29f0098 Signed-off-by: Yaniv Bronhaim ybronhei@redhat.com Reviewed-on: http://gerrit.ovirt.org/35739 Reviewed-by: Dan Kenigsberg danken@redhat.com --- M init/vdsmd_init_common.sh.in M vdsm.spec.in 2 files changed, 5 insertions(+), 2 deletions(-)
Approvals: Yaniv Bronhaim: Verified Dan Kenigsberg: Looks good to me, approved
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Fixed %post script error during upgrade ......................................................................
Patch Set 2:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master-libfapi_create-rpms-el6-x86_64_merg... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/248/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master-libfapi_create-rpms-fc20-x86_64_mer... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged_test_debug/465/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master-libfapi_create-rpms-el7-x86_64_merg... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/263/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4257/ : ABORTED
http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/270/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/272/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master-libfapi_create-rpms-fc21-x86_64_mer... : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/6095/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Fixed %post script error during upgrade ......................................................................
Patch Set 1:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc21_created/119... : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el6_created/685/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/13805/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc20_created/665... : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/13016/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/13968/ : ABORTED
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el7_created/124/ : FAILURE
vdsm-patches@lists.fedorahosted.org