(*) basically no operational change

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index 09cf5b2..dbe568f 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 threading
 import time
 import vserver
 
@@ -43,15 +42,16 @@ class Sliver_VS(accounts.Account, vserver.VServer):
 
     SHELL = '/bin/vsh'
     TYPE = 'sliver.VServer'
-    _init_disk_info_sem = threading.Semaphore(1)
+    _init_disk_info_sem = tools.NMLock("/var/run/nm-disk-info.lock")
 
     def __init__(self, rec):
+        logger.verbose ('initing Sliver_VS with name=%s'%rec['name'])
         try:
             vserver.VServer.__init__(self, rec['name'])
         except Exception, err:
             if not isinstance(err, vserver.NoSuchVServer):
                 # Probably a bad vserver or vserver configuration file
-                logger.log_exc()
+                logger.log_exc(self.name)
                 logger.log('%s: recreating bad vserver' % rec['name'])
                 self.destroy(rec['name'])
             self.create(rec['name'], rec['vref'])
@@ -66,6 +66,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
 
     @staticmethod
     def create(name, vref = None):
+        logger.verbose('Sliver_VS:create - name=%s'%name)
         if vref is not None:
             logger.log_call('/usr/sbin/vuseradd', '-t', vref, name)
         else:
@@ -93,7 +94,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             try:
                 self.chroot_call(install_initscript)
                 self.initscriptchanged = True
-            except: logger.log_exc()
+            except: logger.log_exc(self.name)
 
         accounts.Account.configure(self, rec)  # install ssh keys
 
@@ -128,9 +129,9 @@ class Sliver_VS(accounts.Account, vserver.VServer):
                 logger.log('%s: computing disk usage: ended' % self.name)
                 self.disk_usage_initialized = True
             vserver.VServer.set_disklimit(self, max(disk_max, self.disk_blocks))
-        except OSError:
+        except:
             logger.log('%s: failed to set max disk usage' % self.name)
-            logger.log_exc()
+            logger.log_exc(self.name)
 
         # get/set the min/soft/hard values for all of the vserver
         # related RLIMITS.  Note that vserver currently only
@@ -169,6 +170,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)
 
+            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)