BW limits and resources are handled by bwmon.py

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index 13ff990..7457eb9 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -24,6 +24,9 @@ import vserver
 import accounts
 import logger
 import tools
+from threading import BoundedSemaphore
+
+globalsem = BoundedSemaphore()
 
 # special constant that tells vserver to keep its existing settings
 KEEP_LIMIT = vserver.VC_LIM_KEEP
@@ -42,7 +45,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
 
     SHELL = '/bin/vsh'
     TYPE = 'sliver.VServer'
-    _init_disk_info_sem = tools.NMLock("/var/run/nm-disk-info.lock")
+    _init_disk_info_sem = globalsem
 
     def __init__(self, rec):
         logger.verbose ('initing Sliver_VS with name=%s'%rec['name'])
@@ -198,18 +201,6 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         if self.rspec['capabilities']:
             logger.log('%s: setting capabilities to %s' % (self.name, self.rspec['capabilities']))
 
-        if False: # this code was commented out before
-            # N.B. net_*_rate are in kbps because of XML-RPC maxint
-            # limitations, convert to bps which is what bwlimit.py expects.
-            net_limits = (self.rspec['net_min_rate'] * 1000,
-                          self.rspec['net_max_rate'] * 1000,
-                          self.rspec['net_i2_min_rate'] * 1000,
-                          self.rspec['net_i2_max_rate'] * 1000,
-                          self.rspec['net_share'])
-            logger.log('%s: setting net limits to %s bps' % (self.name, net_limits[:-1]))
-            logger.log('%s: setting net share to %d' % (self.name, net_limits[-1]))
-            self.set_bwlimit(*net_limits)
-
         cpu_pct = self.rspec['cpu_pct']
         cpu_share = self.rspec['cpu_share']