Zhou Zheng Sheng has uploaded a new change for review.
Change subject: Ubuntu: Sync with vdsm.spec.in ......................................................................
Ubuntu: Sync with vdsm.spec.in
Recently we split zombiereaper and made some changes in libvirt configuring. This patch update Ubuntu packaging scripts to keep up with vdsm.spec.in.
Change-Id: Ib4eccbc0a32847036a2b4de8510ed352ddc124bd Signed-off-by: Zhou Zheng Sheng zhshzhou@linux.vnet.ibm.com --- M debian/control A debian/vdsm-python-zombiereaper.docs A debian/vdsm-python-zombiereaper.install M debian/vdsm.install M debian/vdsm.postinst 5 files changed, 32 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/21297/1
diff --git a/debian/control b/debian/control index 78587d2..cb4d5da 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Build-Depends: debhelper (>= 8.0.0), autoconf, automake, + gcc, genisoimage, gettext, libasprintf-dev, @@ -43,6 +44,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>=2.7.3) Description: VDSM python libraries Shared libraries between the various VDSM packages. + +Package: vdsm-python-zombiereaper +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>=2.7.3) +Description: zombiereaper for Python + Collects zombie processes automatically so you don't have to
Package: vdsm-client Architecture: all @@ -114,6 +121,7 @@ tree, vdsm-python (= ${source:Version}), xz-utils, + vdsm-python-zombiereaper (= ${source:Version}), vdsm-yajsonrpc (= ${source:Version}) Conflicts: apparmor Description: VDSM: Virtual Desktop Server Manager diff --git a/debian/vdsm-python-zombiereaper.docs b/debian/vdsm-python-zombiereaper.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-python-zombiereaper.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-python-zombiereaper.install b/debian/vdsm-python-zombiereaper.install new file mode 100644 index 0000000..768ef9f --- /dev/null +++ b/debian/vdsm-python-zombiereaper.install @@ -0,0 +1 @@ +./usr/lib/python2.7/dist-packages/zombiereaper/__init__.py diff --git a/debian/vdsm.install b/debian/vdsm.install index bffd782..51d365a 100644 --- a/debian/vdsm.install +++ b/debian/vdsm.install @@ -133,5 +133,4 @@ ./usr/share/vdsm/vdsmapi-schema.json ./usr/share/vdsm/vm.py ./usr/share/vdsm/vmChannels.py -./usr/share/vdsm/zombieReaper.py ./var/lib/polkit-1/localauthority/10-vendor.d/10-vdsm-libvirt-access.pkla diff --git a/debian/vdsm.postinst b/debian/vdsm.postinst index 6422548..4bc1515 100644 --- a/debian/vdsm.postinst +++ b/debian/vdsm.postinst @@ -94,14 +94,28 @@ # dh helpers. Restarting vdsmd should be run after dh helpers so that the # hooks are invoked correctly. if [ "$1" = "configure" ]; then - if initctl status supervdsmd | grep -q start/running ; then - initctl stop supervdsmd || : - initctl start supervdsmd || : - fi - if initctl status vdsmd | grep -q start/running ; then - initctl stop vdsmd || : - initctl start vdsmd || : - fi + supervdsmd_start_required='no' + vdsmd_start_required='no' + + # Both vdsm and supervdsm should be managed here and must be restarted if + # ran before (code might changed) + if initctl status supervdsmd | grep -q start/running ; then + supervdsmd_start_required='yes' + fi + if initctl status vdsmd | grep -q start/running ; then + vdsmd_start_required='yes' + fi + if ! vdsm-tool is-configured --module libvirt >/dev/null 2>&1; then + vdsm-tool configure --module libvirt --force >/dev/null 2>&1 + fi + if [ "${supervdsmd_start_required}" = 'yes' ]; then + initctl stop supervdsmd || : + initctl start supervdsmd || : + fi + if [ "${vdsmd_start_required}" = 'yes' ]; then + initctl stop vdsmd || : + initctl start vdsmd || : + fi fi
exit 0
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Ubuntu: Sync with vdsm.spec.in ......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4655/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5455/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5534/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
Dan Kenigsberg has posted comments on this change.
Change subject: Ubuntu: Sync with vdsm.spec.in ......................................................................
Patch Set 1: Code-Review+2
Zhou Zheng Sheng has posted comments on this change.
Change subject: Ubuntu: Sync with vdsm.spec.in ......................................................................
Patch Set 1: Verified+1
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Ubuntu: Sync with vdsm.spec.in ......................................................................
Ubuntu: Sync with vdsm.spec.in
Recently we split zombiereaper and made some changes in libvirt configuring. This patch update Ubuntu packaging scripts to keep up with vdsm.spec.in.
Change-Id: Ib4eccbc0a32847036a2b4de8510ed352ddc124bd Signed-off-by: Zhou Zheng Sheng zhshzhou@linux.vnet.ibm.com Reviewed-on: http://gerrit.ovirt.org/21297 Reviewed-by: Dan Kenigsberg danken@redhat.com --- M debian/control A debian/vdsm-python-zombiereaper.docs A debian/vdsm-python-zombiereaper.install M debian/vdsm.install M debian/vdsm.postinst 5 files changed, 32 insertions(+), 9 deletions(-)
Approvals: Dan Kenigsberg: Looks good to me, approved Zhou Zheng Sheng: Verified
vdsm-patches@lists.fedorahosted.org