Royce Lv has uploaded a new change for review.
Change subject: [WIP]make changes to init script ......................................................................
[WIP]make changes to init script
Change-Id: I8faed69248ebe56c392fadb9de9dcbd1c67e6264 Signed-off-by: Royce Lvlvroyce@linux.vnet.ibm.com --- M tests/Makefile.am M vdsm.spec.in M vdsm/Makefile.am R vdsm/supervdsmServer M vdsm/vdsmd.init.in 5 files changed, 10 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/11197/1
diff --git a/tests/Makefile.am b/tests/Makefile.am index b61bf50..b9acfa5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -50,7 +50,6 @@ schemaTests.py \ sslTests.py \ storageMailboxTests.py \ - superVdsmTests.py \ tcTests.py \ utilsTests.py \ vdsClientTests.py \ diff --git a/vdsm.spec.in b/vdsm.spec.in index 632d315..9da8840 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -633,10 +633,10 @@ %{_datadir}/%{vdsm_name}/parted_utils.py* %{_datadir}/%{vdsm_name}/mkimage.py* %{_datadir}/%{vdsm_name}/supervdsm.py* -%{_datadir}/%{vdsm_name}/supervdsmServer.py* +%{_datadir}/%{vdsm_name}/supervdsmServer %{_datadir}/%{vdsm_name}/vmChannels.py* %{_datadir}/%{vdsm_name}/tc.py* -%{_datadir}/%{vdsm_name}/vdsm +%{_datadir}/%{vdsm_name}/vdsmServer.py* %{_datadir}/%{vdsm_name}/vdsm-restore-net-config %{_datadir}/%{vdsm_name}/vdsm-store-net-config %{_datadir}/%{vdsm_name}/vm.py* diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 88b3287..4ea770f 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -48,7 +48,7 @@ nwfilter.py \ parted_utils.py \ supervdsm.py \ - supervdsmServer.py \ + vdsmServer.py \ tc.py \ vdsmDebugPlugin.py \ vmChannels.py \ @@ -99,7 +99,7 @@ get-conf-item \ respawn \ set-conf-item \ - vdsm \ + supervdsmServer \ vdsm-restore-net-config \ write-net-config
diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer similarity index 99% rename from vdsm/supervdsmServer.py rename to vdsm/supervdsmServer index e0f7ab2..a14e9dc 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer @@ -1,3 +1,4 @@ +#!/usr/bin/python # Copyright 2011 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify @@ -417,5 +418,4 @@ if __name__ == '__main__': vdsmProc = Process(target=startVdsm) vdsmProc.start() - sleep(2) startSvdsm(ADDRESS, vdsmProc) diff --git a/vdsm/vdsmd.init.in b/vdsm/vdsmd.init.in index c8223d3..c056c6b 100755 --- a/vdsm/vdsmd.init.in +++ b/vdsm/vdsmd.init.in @@ -23,7 +23,7 @@
. @LIBEXECDIR@/ovirt_functions.sh
-VDSM_BIN=@VDSMDIR@/vdsm +SVDSM_BIN=@VDSMDIR@/supervdsmServer CONF_FILE=@CONFDIR@/vdsm.conf GETCONFITEM=@VDSMDIR@/get-conf-item prog=vdsm @@ -190,7 +190,7 @@ test_already_running() { if pidofproc -p $RESPAWNPIDFILE >/dev/null || \ - pidofproc -p $PIDFILE $VDSM_BIN >/dev/null; then + pidofproc -p $PIDFILE $SVDSM_BIN >/dev/null; then log_success_msg "$prog: already running" return 0 fi @@ -499,7 +499,7 @@
LIBVIRT_LOG_FILTERS=`$GETCONFITEM $CONF_FILE vars libvirt_log_filters "1:libvirt 1:remote"` \ LIBVIRT_LOG_OUTPUTS=`$GETCONFITEM $CONF_FILE vars libvirt_log_outputs "1:file:/var/log/vdsm/libvirt.log"` \ - LC_ALL=C NICELEVEL=$vdsm_nice daemon --user=vdsm @VDSMDIR@/respawn --minlifetime 10 --daemon --masterpid $RESPAWNPIDFILE $VDSM_BIN + LC_ALL=C NICELEVEL=$vdsm_nice daemon @VDSMDIR@/respawn --minlifetime 10 --daemon --masterpid $RESPAWNPIDFILE $SVDSM_BIN RETVAL=$? [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start" [ "$RETVAL" -eq 0 ] && touch /var/lock/subsys/vdsmd @@ -533,7 +533,7 @@ RETVAL=$? ;; status) - pidofproc -p $PIDFILE $VDSM_BIN >/dev/null + pidofproc -p $PIDFILE $SVDSM_BIN >/dev/null RETVAL=$? if [ "$RETVAL" -eq 0 ]; then echo "VDS daemon server is running" @@ -547,7 +547,7 @@ fi ;; condrestart) - pidofproc -p $PIDFILE $VDSM_BIN >/dev/null + pidofproc -p $PIDFILE $SVDSM_BIN >/dev/null RETVAL=$? if [ "$RETVAL" -eq 0 ]; then $0 stop && $0 start;
-- To view, visit http://gerrit.ovirt.org/11197 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: I8faed69248ebe56c392fadb9de9dcbd1c67e6264 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com