set personality for slivers with a different arch

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index e7d86d8..91f696a 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -19,6 +19,8 @@ don't have to guess if there is a running process or not.
 import errno
 import os, os.path
 import time
+import commands
+
 import vserver
 
 import accounts
@@ -68,6 +70,20 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         self.initscriptchanged = False
         self.configure(rec)
 
+    _root_context_arch=None
+    @staticmethod 
+    def root_context_arch():
+        if not Sliver_VS._root_context_arch:
+            Sliver_VS._root_context_arch=commands.getoutput("uname -i")
+        return Sliver_VS._root_context_arch
+
+    @staticmethod
+    def personality (arch):
+        personality="linux32"
+        if arch.find("64")>=0:
+            personality="linux64"
+        return personality
+
     @staticmethod
     def create(name, vref = None):
         logger.verbose('Sliver_VS:create - name=%s'%name)
@@ -89,12 +105,15 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             # default
             default=file("/etc/planetlab/slicefamily").read().strip()
             (pldistro,fcdistro,arch) = default.split("-")
+
+            known_archs = [ 'i386', 'x86_64' ]
+            known_fcdistros = [ 'f8', 'f9', 'centos5' ]
             # 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":
+                if wish in known_archs:
                     arch=wish
-                elif wish == "f8" or wish == "centos5" :
+                elif wish in known_fcdistros:
                     fcdistro=wish
                 else:
                     pldistro=wish
@@ -102,28 +121,36 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             # rejoin the parts
             refname="-".join( (pldistro,fcdistro,arch) )
 
-            # check the templates exists -- there's probably a better way..
+            # check the template exists -- there's probably a better way..
             if not os.path.isdir ("/vservers/.vref/%s"%refname):
                 logger.verbose("%s (%s) : vref %s not found, using default %s"%(
                         name,vref,refname,default))
                 refname=default
+                # reset so arch is right
+                (pldistro,fcdistro,arch) = default.split("-")
                 # 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
+            # for legacy nodes
             refname="default"
+            arch="i386"
         except:
             import traceback
-            logger.log("%s (%s) : unexpected error follows - using 'default'"%(
-                    name,vref))
+            logger.log("%s (%s) : unexpected error follows - using 'default'"%(name,vref))
             logger.log(traceback.format_exc())
             refname="default"
+            arch="i386"
             
         logger.log_call('/usr/sbin/vuseradd', '-t', refname, name)
-        open('/vservers/%s/etc/slicename' % name, 'w').write(name)
+        # export slicename to the slice in /etc/slicename
+        file('/vservers/%s/etc/slicename' % name, 'w').write(name)
+        # set personality: only if needed (if arch's differ)
+        if Sliver_VS.root_context_arch() != arch:
+            file('/etc/vservers/%s/personality' % name, 'w').write(Sliver_VS.personality(arch))
+            logger.log('%s: set personality to %s'%(name,Sliver_VS.personality(arch)))
 
     @staticmethod
     def destroy(name): logger.log_call('/usr/sbin/vuserdel', name)
@@ -154,9 +181,14 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         if self.rspec['enabled'] > 0:
             logger.log('%s: starting in %d seconds' % (self.name, delay))
             time.sleep(delay)
-            # VServer.start calls fork() internally
-            vserver.VServer.start(self)
-
+            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()
+                vserver.VServer.start(self)
+                os._exit(0)
+            else: os.waitpid(child_pid, 0)
         else: logger.log('%s: not starting, is not enabled' % self.name)
         self.initscriptchanged = False