X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=7457eb9d0af5be4d60732e92d00ad6a9bdab9922;hb=bb4c5a42f5f58116f7a017d470389be505841b98;hp=ca5d144780509a43c2582eb1830cacce8db71f76;hpb=ac32a7847ed26019377496b0849df5127f3b479b;p=nodemanager.git

diff --git a/sliver_vs.py b/sliver_vs.py
index ca5d144..7457eb9 100644
--- 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'])
@@ -74,48 +77,51 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             # this is a first draft, and more a proof of concept thing
             # the idea is to parse vref for dash-separated wishes,
             # and to project these against the defaults
-            # however for cases like when vref is 'planetflow', if we do not understand
-            # any of the wishes we take vref as is
-            # this could be improved by having the vserver-reference init script be a bit smarter
-            # so we could take planetflow as the pldistro part here
-            as_is=None
-            # defaults
-            default=file("/etc/planetlab/defaultvref").read()
+            # so e.g. if the default slice family (as found in /etc/planetlab/slicefamily)
+            # is planetlab-f8-i386, then here is what we get
+            # vref=x86_64             -> vuseradd -t planetlab-f8-x86_64 
+            # vref=centos5            -> vuseradd -t planetlab-centos5-i386 
+            # vref=centos5-onelab     -> vuseradd -t onelab-centos5-i386 
+            # vref=planetflow         -> vuseradd -t planetflow-f8-i386
+            # vref=x86_64-planetflow  -> vuseradd -t planetflow-f8-x86_64
+
+            # default
+            default=file("/etc/planetlab/slicefamily").read().strip()
             (pldistro,fcdistro,arch) = default.split("-")
             # from the slice attribute: cut dashes and try to figure the meaning
             slice_wishes = vref.split("-")
             for wish in slice_wishes:
                 if wish == "i386" or wish == "x86_64":
                     arch=wish
-                elif wish == "planetlab" or wish == "onelab" or wish == "vini":
-                    pldistro=wish
                 elif wish == "f8" or wish == "centos5" :
                     fcdistro=wish
                 else:
-                    # if we find something like e.g. planetflow, use it as-is
-                    as_is=vref
-                    break
-            if as_is:
-                refname=as_is
-            else:
-                refname="-".join( (pldistro,fcdistro,arch) )
+                    pldistro=wish
+
+            # rejoin the parts
+            refname="-".join( (pldistro,fcdistro,arch) )
+
             # check the templates exists -- there's probably a better way..
             if not os.path.isdir ("/vservers/.vref/%s"%refname):
-                log.verbose("%s (%s) : vref %s not found, using default %s"%(
+                logger.verbose("%s (%s) : vref %s not found, using default %s"%(
                         name,vref,refname,default))
                 refname=default
-            except IOError:
-                # have not found defaultvref
-                logger.verbose("%s (%s): using fallback vrefname 'default'"%(name,vref))
+                # could check again, but as we have /etc/slicefamily 
+                # there's probably no /vservers/.vref/default
+
+        except IOError:
+            # have not found slicefamily
+            logger.verbose("%s (%s): legacy node - using fallback vrefname 'default'"%(name,vref))
                 # for legacy nodes
-                refname="default"
-            except:
-                import traceback
-                logger.log("%s (%s) : unexpected error follows - using 'default'"%(
-                        name,vref))
-                logger.log(traceback.format_exc())
+            refname="default"
+        except:
+            import traceback
+            logger.log("%s (%s) : unexpected error follows - using 'default'"%(
+                    name,vref))
+            logger.log(traceback.format_exc())
+            refname="default"
             
-            logger.log_call('/usr/sbin/vuseradd', '-t', refname, name)
+        logger.log_call('/usr/sbin/vuseradd', '-t', refname, name)
         open('/vservers/%s/etc/slicename' % name, 'w').write(name)
 
     @staticmethod
@@ -195,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']