Change in vdsm[master]: Removing support in sysv and upstart

danken at redhat.com danken at redhat.com
Tue May 12 11:51:16 UTC 2015


Dan Kenigsberg has posted comments on this change.

Change subject: Removing support in sysv and upstart
......................................................................


Patch Set 2:

(5 comments)

https://gerrit.ovirt.org/#/c/40726/2/init/sysvinit/respawn
File init/sysvinit/respawn:

Line 1
Line 2
Line 3
goodbye!


https://gerrit.ovirt.org/#/c/40726/2/vdsm.spec.in
File vdsm.spec.in:

Line 868: 
Line 869: %systemd_preun vdsmd.service
Line 870: %systemd_preun vdsm-network.service
Line 871: %systemd_preun supervdsmd.service
Line 872: if [ "$1" -eq 0 ]; then
here again, the %else branch has remained. it must be dropped.
Line 873:     /bin/systemctl --no-reload disable vdsmd.service > /dev/null 2>&1 || :
Line 874:     /bin/systemctl --no-reload disable supervdsmd.service > /dev/null 2>&1 || :
Line 875:     /bin/systemctl stop vdsmd.service > /dev/null 2>&1 || :
Line 876:     /bin/systemctl stop vdsm-network.service > /dev/null 2>&1 || :


Line 948: exit 0
Line 949: 
Line 950: %preun reg
Line 951: %systemd_preun vdsm-reg.service
Line 952: if [ "$1" -eq 0 ]; then
the %else section must be dropped. the current code is very confusing due to

http://gerrit.ovirt.org/33380
Line 953:     /bin/systemctl --no-reload disable vdsm-reg.service > /dev/null 2>&1 || :
Line 954:     /bin/systemctl stop vdsm-reg.service > /dev/null 2>&1 || :
Line 955: fi
Line 956: exit 0


Line 1273: %{_datadir}/%{vdsm_name}/config.py*
Line 1274: %{_datadir}/%{vdsm_name}/netinfo.py*
Line 1275: %endif
Line 1276: %exclude %{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py*
Line 1277: %{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py*
this line must be dropped.
Line 1278: %{python_sitelib}/%{vdsm_name}/tool/configfile.py*
Line 1279: %{python_sitelib}/%{vdsm_name}/tool/dummybr.py*
Line 1280: %{python_sitelib}/%{vdsm_name}/tool/dump_bonding_defaults.py*
Line 1281: %{python_sitelib}/%{vdsm_name}/tool/nwfilter.py*


https://gerrit.ovirt.org/#/c/40726/2/vdsm/clientIF.py
File vdsm/clientIF.py:

Line 502:                 if fileType in ["guest.socket", "monitor.socket", "pid",
Line 503:                                 "stdio.dump", "recovery"]:
Line 504:                     if vmId in self.vmContainer:
Line 505:                         continue
Line 506:                     if f == 'vdsmd.pid':
all .pid files are sysv-specific and should be dropped.
Line 507:                         continue
Line 508:                     if f == 'supervdsmd.pid':
Line 509:                         continue
Line 510:                 else:


-- 
To view, visit https://gerrit.ovirt.org/40726
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib9af14b3d78badc5250042508d25f294dc514a2d
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Dima Kuznetsov <dkuznets at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-HasComments: Yes


More information about the vdsm-patches mailing list