git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patched with nm-disk-lock.patch provided by dhozac. Closes (or attempts to) [ticket...
[nodemanager.git]
/
sliver_vs.py
diff --git
a/sliver_vs.py
b/sliver_vs.py
index
09cf5b2
..
270f112
100644
(file)
--- a/
sliver_vs.py
+++ b/
sliver_vs.py
@@
-18,7
+18,6
@@
don't have to guess if there is a running process or not.
import errno
import os
import errno
import os
-import threading
import time
import vserver
import time
import vserver
@@
-43,7
+42,7
@@
class Sliver_VS(accounts.Account, vserver.VServer):
SHELL = '/bin/vsh'
TYPE = 'sliver.VServer'
SHELL = '/bin/vsh'
TYPE = 'sliver.VServer'
- _init_disk_info_sem = t
hreading.Semaphore(1
)
+ _init_disk_info_sem = t
ools.NMLock("/var/run/nm-disk-info.lock"
)
def __init__(self, rec):
try:
def __init__(self, rec):
try:
@@
-169,6
+168,10
@@
class Sliver_VS(accounts.Account, vserver.VServer):
logger.log('%s: setting cpu share to %d' % (self.name, cpu_share))
self.set_sched_config(cpu_share, 0)
logger.log('%s: setting cpu share to %d' % (self.name, cpu_share))
self.set_sched_config(cpu_share, 0)
+ if self.rspec['ip_addresses'] != '0.0.0.0':
+ logger.log('%s: setting IP address(es) to %s' % (self.name, self.rspec['ip_addresses']))
+ self.set_ipaddresses_config(self.rspec['ip_addresses'])
+
if False: # Does not work properly yet.
if self.have_limits_changed():
logger.log('%s: limits have changed --- restarting' % self.name)
if False: # Does not work properly yet.
if self.have_limits_changed():
logger.log('%s: limits have changed --- restarting' % self.name)