X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserver.py;h=a4e828d00111901cd04066e0e6e833243e077afd;hb=16d8f5d34df3c1fd2f3895fae64e1b77a5c8e6b1;hp=c6a1cc7e3c2a60c644e098ab26372478c0fc4d2b;hpb=87bb0cc580b61e62b56942ab621e0c23d6fac976;p=util-vserver-pl.git

diff --git a/python/vserver.py b/python/vserver.py
index c6a1cc7..a4e828d 100644
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -20,6 +20,7 @@ import cpulimit, bwlimit
 
 from vserverimpl import DLIMIT_INF
 from vserverimpl import VC_LIM_KEEP
+from vserverimpl import VC_LIM_INFINITY
 from vserverimpl import VLIMIT_NSOCK
 from vserverimpl import VLIMIT_OPENFD
 from vserverimpl import VLIMIT_ANON
@@ -133,10 +134,6 @@ class VServerConfig:
 
 class VServer:
 
-    # 2010 June 21 - Thierry 
-    # the slice initscript now gets invoked through rc - see sliver_vs.py in nodemanager
-    INITSCRIPTS = [('/etc/rc.d/rc', '%(runlevel)d')]
-
     def __init__(self, name, vm_id = None, vm_running = None, logfile=None):
 
         self.name = name
@@ -233,18 +230,25 @@ class VServer:
 
     def set_ipaddresses(self, addresses):
         vserverimpl.netremove(self.ctx, "all")
-        for a in addresses.split(","):
-            vserverimpl.netadd(self.ctx, a)
+        for ip in addresses:
+            vserverimpl.netadd(self.ctx, ip)
 
     def set_ipaddresses_config(self, addresses):
-        return # acb
+        ip_addresses = addresses.split(",")
+
+        # add looopback interface
+        if not ip_addresses.__contains__("127.0.0.1"):
+            ip_addresses.append("127.0.0.1")
+
         i = 0
-        for a in addresses.split(","):
-            self.config.update("interfaces/%d/ip" % i, a)
+        for ip in ip_addresses:
+            self.config.update("interfaces/%d/ip" % i, ip)
+            # create emtpy nodev files to silent "No device specified for" warnings
+            self.config.update("interfaces/%d/nodev" % i, "")
             i += 1
-        while self.config.unset("interfaces/%d/ip" % i):
+        while self.config.unset("interfaces/%d/ip" % i) and self.config.update("interfaces/%d/nodev" % i):
             i += 1
-        self.set_ipaddresses(addresses)
+        self.set_ipaddresses(ip_addresses)
 
     def get_ipaddresses_config(self):
         i = 0
@@ -331,7 +335,7 @@ class VServer:
     def set_sched_config(self, cpu_min, cpu_share):
         """ Write current CPU scheduler parameters to the vserver
         configuration file. Currently, 'cpu_min' is not supported. """
-        self.config.update('cgroup/cpu.shares', cpu_share * CPU_SHARE_MULT)
+        self.config.update('cgroup/cpu.shares', int(cpu_share) * CPU_SHARE_MULT)
         if self.is_running():
             self.set_sched(cpu_min, cpu_share)
 
@@ -339,8 +343,8 @@ class VServer:
         """ Update kernel CPU scheduling parameters for this context.
         Currently, 'cpu_min' is not supported. """
         try:
-            cgroup = open('/dev/cgroup/%s/cpu.shares' % name, 'w')
-            cgroup.write('%s' % (cpu_share * CPU_SHARE_MULT))
+            cgroup = open('/dev/cgroup/%s/cpu.shares' % self.name, 'w')
+            cgroup.write('%s' % (int(cpu_share) * CPU_SHARE_MULT))
             cgroup.close()
         except:
             pass
@@ -377,8 +381,10 @@ class VServer:
     def enter(self):
         subprocess.call("/usr/sbin/vserver %s enter" % self.name, shell=True)
 
-    # detach the process that triggers the initscripts
-    # after http://code.activestate.com/recipes/278731/
+    # 2010 June 21 - Thierry 
+    # the slice initscript now gets invoked through rc - see sliver_vs.py in nodemanager
+    # and, rc is triggered as part of vserver .. start 
+    # so we don't have to worry about initscripts at all anymore here
     def start(self, runlevel = 3):
         if os.fork() != 0:
             # Parent should just return.
@@ -391,33 +397,11 @@ class VServer:
                 os._exit(0)	# Exit parent (the first child) of the second child.
             # the grandson is the working one
             os.chdir('/')
-            os.umask(0)
+            os.umask(0022)
             try:
                 # start the vserver
                 subprocess.call(["/usr/sbin/vserver",self.name,"start"])
 
-                # execute initscripts
-                for cmd_to_expand in self.INITSCRIPTS:
-                    # enter vserver context
-                    expand = { 'runlevel': runlevel,
-                               'name': self.name, }
-                    cmd = [ x % expand for x in cmd_to_expand ]
-                    cmd_name = os.path.basename(cmd[0])
-                    cmd_file = "/vservers/" + self.name + cmd[0]
-                    if not os.path.isfile(cmd_file):
-                        self.log("WARNING: could not find %s for %s" % (cmd_file, self.name))
-                        break
-                    self.log("executing %r" % cmd)
-                    try:
-                        logname='/vservers/%s/var/log/%s'%(self.name,cmd_name)
-                        log_fd=os.open(logname,os.O_WRONLY | os.O_CREAT | os.O_APPEND, 0600)
-                        self.log_in_file(log_fd,"Running %r into %s"%(cmd,logname))
-                        self.chroot_call(subprocess.call,cmd,
-                                         stdout=log_fd,stderr=subprocess.STDOUT,
-                                         close_fds=True)
-                    except:  self.log(traceback.format_exc())
-                    finally: os.close(log_fd)
-
             # we get here due to an exception in the grandson process
             except Exception, ex:
                 self.log(traceback.format_exc())
@@ -484,12 +468,3 @@ def create(vm_name, static = False, ctor = VServer):
     vm_id = pwd.getpwnam(vm_name)[2]
 
     return ctor(vm_name, vm_id)
-
-
-def close_nonstandard_fds():
-    """Close all open file descriptors other than 0, 1, and 2."""
-    _SC_OPEN_MAX = 4
-    for fd in range(3, os.sysconf(_SC_OPEN_MAX)):
-        try: os.close(fd)
-        except OSError: pass  # most likely an fd that isn't open
-