git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
de3ce5d
)
rerun initscript with 'restart' argument if the initscript is changed after the slive...
author
smbaker
<smbaker@gmail.com>
Sun, 13 Mar 2011 03:46:14 +0000
(19:46 -0800)
committer
S.Çağlar Onur
<caglar@verivue.com>
Sun, 13 Mar 2011 15:56:17 +0000
(11:56 -0400)
sliver_vs.py
patch
|
blob
|
history
diff --git
a/sliver_vs.py
b/sliver_vs.py
index
7ee1825
..
e53135a
100644
(file)
--- a/
sliver_vs.py
+++ b/
sliver_vs.py
@@
-19,6
+19,7
@@
don't have to guess if there is a running process or not.
import errno
import traceback
import os, os.path
import errno
import traceback
import os, os.path
+import sys
import time
import vserver
import time
import vserver
@@
-27,6
+28,7
@@
import accounts
import logger
import tools
from threading import BoundedSemaphore
import logger
import tools
from threading import BoundedSemaphore
+import subprocess
globalsem = BoundedSemaphore()
globalsem = BoundedSemaphore()
@@
-182,6
+184,12
@@
class Sliver_VS(accounts.Account, vserver.VServer):
except:
logger.log_exc("vsliver_vs: %s: failed to create runlevel3 symlink %s"%rc3_link)
except:
logger.log_exc("vsliver_vs: %s: failed to create runlevel3 symlink %s"%rc3_link)
+ def rerun_slice_vinit(self):
+ command = "/usr/sbin/vserver %s exec /etc/rc.d/init.d/vinit.slice restart %s" % (self.name, self.name)
+
+ logger.log("vsliver_vs: %s: Rerunning slice initscript: %s" % (self.name, command))
+ subprocess.call(command + "&", stdin=open('/dev/null', 'r'), stdout=open('/dev/null', 'w'), stderr=subprocess.STDOUT, shell=True)
+
# this one checks for the existence of the slice initscript
# install or remove the slice inistscript, as instructed by the initscript tag
def refresh_slice_vinit(self):
# this one checks for the existence of the slice initscript
# install or remove the slice inistscript, as instructed by the initscript tag
def refresh_slice_vinit(self):
@@
-190,6
+198,12
@@
class Sliver_VS(accounts.Account, vserver.VServer):
if tools.replace_file_with_string(sliver_initscript,body,remove_if_empty=True,chmod=0755):
if body:
logger.log("vsliver_vs: %s: Installed new initscript in %s"%(self.name,sliver_initscript))
if tools.replace_file_with_string(sliver_initscript,body,remove_if_empty=True,chmod=0755):
if body:
logger.log("vsliver_vs: %s: Installed new initscript in %s"%(self.name,sliver_initscript))
+ if self.is_running():
+ # Only need to rerun the initscript if the vserver is
+ # already running. If the vserver isn't running, then the
+ # initscript will automatically be started by
+ # /etc/rc.d/vinit when the vserver is started.
+ self.rerun_slice_vinit()
else:
logger.log("vsliver_vs: %s: Removed obsolete initscript %s"%(self.name,sliver_initscript))
else:
logger.log("vsliver_vs: %s: Removed obsolete initscript %s"%(self.name,sliver_initscript))