nm_enabled is true for positive values instead of nonzero values

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index f6e9397..e4856a6 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -18,6 +18,7 @@ don't have to guess if there is a running process or not.
 
 import errno
 import os
+import time
 import vserver
 
 import accounts
@@ -25,26 +26,19 @@ import logger
 import tools
 
 
-DEFAULTS = {'disk_max': 5000000,
-            'net_min':    bwmin,
-            'net_max':    bwmax,
-            'net2_min':   bwmin,
-            'net2_max':   bwmax,
-            'net_share':      1,
-            'enabled':        1,
-            'cpu_min':        0,
-            'cpu_share':     32,
-            'keys':          '',
-            'initscript':    ''}
-
 class Sliver_VS(accounts.Account, vserver.VServer):
-    """This class wraps vserver.VServer to make its interface closer to what we need for the Node Manager."""
+    """This class wraps vserver.VServer to make its interface closer to what we need."""
 
     SHELL = '/bin/vsh'
     TYPE = 'sliver.VServer'
 
     def __init__(self, rec):
-        vserver.VServer.__init__(self, rec['name'])
+        try:
+            vserver.VServer.__init__(self, rec['name'])
+        except vserver.NoSuchVServer:
+            self.create(rec['name'], rec['type'])
+            vserver.VServer.__init__(self, rec['name'])
+
         self.keys = ''
         self.rspec = {}
         self.initscript = ''
@@ -52,7 +46,11 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         self.configure(rec)
 
     @staticmethod
-    def create(name): logger.log_call('/usr/sbin/vuseradd', name)
+    def create(name, vref = None):
+        if vref is not None:
+            logger.log_call('/usr/sbin/vuseradd', '-t', vref, name)
+        else:
+            logger.log_call('/usr/sbin/vuseradd', name)
 
     @staticmethod
     def destroy(name): logger.log_call('/usr/sbin/vuserdel', name)
@@ -77,13 +75,14 @@ class Sliver_VS(accounts.Account, vserver.VServer):
 
         accounts.Account.configure(self, rec)  # install ssh keys
 
-    def start(self):
+    def start(self, delay=0):
         if self.rspec['enabled']:
-            logger.log('%s: starting' % self.name)
+            logger.log('%s: starting in %d seconds' % (self.name, delay))
             child_pid = os.fork()
             if child_pid == 0:
                 # VServer.start calls fork() internally, so just close the nonstandard fds and fork once to avoid creating zombies
                 tools.close_nonstandard_fds()
+                time.sleep(delay)
                 vserver.VServer.start(self, True)
                 os._exit(0)
             else: os.waitpid(child_pid, 0)
@@ -102,8 +101,10 @@ class Sliver_VS(accounts.Account, vserver.VServer):
                 logger.log('%s: computing disk usage' % self.name)
                 self.init_disk_info()
                 self.disk_usage_initialized = True
-            vserver.VServer.set_disklimit(self, disk_max_KiB)
-        except OSError: logger.log_exc()
+            vserver.VServer.set_disklimit(self, disk_max)
+        except OSError:
+            logger.log('%s: failed to set max disk usage' % self.name)
+            logger.log_exc()
 
         net_limits = (self.rspec['net_min'], self.rspec['net_max'], self.rspec['net2_min'], self.rspec['net2_max'], self.rspec['net_share'])
         logger.log('%s: setting net limits to %s bps' % (self.name, net_limits[:-1]))
@@ -112,8 +113,8 @@ class Sliver_VS(accounts.Account, vserver.VServer):
 
         cpu_min = self.rspec['cpu_min']
         cpu_share = self.rspec['cpu_share']
-        if self.rspec['enabled']:
-            if cpu_min > 0:
+        if self.rspec['enabled'] > 0:
+            if cpu_min >= 50:  # at least 5%: keep people from shooting themselves in the foot
                 logger.log('%s: setting cpu share to %d%% guaranteed' % (self.name, cpu_min/10.0))
                 self.set_sched_config(cpu_min, vserver.SCHED_CPU_GUARANTEED)
             else: