Change in vdsm[master]: vdsmd and supervdsmd: extract common init tasks and add init...

danken at redhat.com danken at redhat.com
Thu Aug 29 10:19:47 UTC 2013


Dan Kenigsberg has submitted this change and it was merged.

Change subject: vdsmd and supervdsmd: extract common init tasks and add init adapter
......................................................................


vdsmd and supervdsmd: extract common init tasks and add init adapter

Move common init tasks from vdsmd.init.in to a separated file,
vdsmd_init_common.sh. This enables SysV init script, SystemD and other
init systems re-use vdsm pre-start/post-stop scripts.

Add vdsm/init/daemonAdapter for various init systems. daemonAdapter can
start vdsm optionally with respawn and console redirection. On powerful
init systems, we call daemonAdapter with no/few options, on SysV init
system, we call it with respawn, console redirection and pid creation
option. In this way we can remedy the gap of powerful init systems and
less powerful ones.

This patch uses daemonAdapter in vdsmd.init.in, vdsmd.service,
supervdsmd.init.in and supervdsmd.service.in.
vdsmd systemd service does not relies on SysV init scripts to run init
tasks any more, it calls vdsmd_init_common.sh to run init tasks.

Change-Id: Id8e514df1ca88500f746242134ddb24c31588046
Signed-off-by: Zhou Zheng Sheng <zhshzhou at linux.vnet.ibm.com>
Reviewed-on: http://gerrit.ovirt.org/15578
Reviewed-by: Alon Bar-Lev <alonbl at redhat.com>
Reviewed-by: Yaniv Bronhaim <ybronhei at redhat.com>
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
---
M .gitignore
M vdsm.spec.in
M vdsm/Makefile.am
A vdsm/daemonAdapter
M vdsm/supervdsmServer.py
M vdsm/supervdsmd.init.in
M vdsm/supervdsmd.service.in
A vdsm/systemd-vdsmd.in
M vdsm/vdsm
M vdsm/vdsmd.init.in
D vdsm/vdsmd.service
A vdsm/vdsmd.service.in
A vdsm/vdsmd_init_common.sh.in
13 files changed, 474 insertions(+), 210 deletions(-)

Approvals:
  Alon Bar-Lev: Looks good to me, but someone else must approve
  Yaniv Bronhaim: Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved
  Zhou Zheng Sheng: Verified



-- 
To view, visit http://gerrit.ovirt.org/15578
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8e514df1ca88500f746242134ddb24c31588046
Gerrit-PatchSet: 21
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshzhou at linux.vnet.ibm.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce at redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw at linux.vnet.ibm.com>
Gerrit-Reviewer: Mei Liu <liumbj at linux.vnet.ibm.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou at linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server


More information about the vdsm-patches mailing list