X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_libvirt.py;h=98525c08e2f0b6aabb2ec721fe92f7ade6fd0839;hb=db1f4974bb5e2f250152890207c9164f8fa4a852;hp=778eb1044ad21d0235eb57a0a2ba606f70ab4339;hpb=da86cf851cca445bee8da1d495cca83ec196bb13;p=nodemanager.git
diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index 778eb10..98525c0 100644
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -4,6 +4,7 @@ import sys
import os, os.path
import subprocess
import pprint
+import random
import libvirt
@@ -95,30 +96,35 @@ class Sliver_Libvirt(Account):
try:
self.dom.destroy()
except:
- logger.verbose('sliver_libvirt: Domain %s not running ' \
- 'UNEXPECTED: %s'%(self.name, sys.exc_info()[1]))
- print 'sliver_libvirt: Domain %s not running ' \
- 'UNEXPECTED: %s'%(self.name, sys.exc_info()[1])
+ logger.log_exc("in sliver_libvirt.stop",name=self.name)
- def is_running(self):
+ def is_running (self):
+ result=self._is_running()
+ logger.log("sliver_libvirt.is_running on %s returned %s"%(self.name,result))
+ return result
+
+ def _is_running(self):
''' Return True if the domain is running '''
- logger.verbose('sliver_libvirt: %s is_running'%self.name)
+ logger.verbose('sliver_libvirt: entering is_running on [%s:%s]'%(self.name,self.dom.ID()))
try:
- [state, _, _, _, _] = self.dom.info()
+ state, _, _, _, _ = self.dom.info()
if state == libvirt.VIR_DOMAIN_RUNNING:
logger.verbose('sliver_libvirt: %s is RUNNING'%self.name)
return True
else:
- info = debuginfo(self.dom)
+ info = Sliver_Libvirt.debuginfo(self.dom)
logger.verbose('sliver_libvirt: %s is ' \
'NOT RUNNING...\n%s'%(self.name, info))
return False
except:
- logger.verbose('sliver_libvirt: UNEXPECTED ERROR in ' \
- '%s: %s'%(self.name, sys.exc_info()[1]))
- print 'sliver_libvirt: UNEXPECTED ERROR in ' \
- '%s: %s'%(self.name, sys.exc_info()[1])
- return False
+ logger.log("Re-fetching dom from name=%s"%self.name)
+ try:
+ self.dom=self.conn.lookupByName(self.name)
+ state, _, _, _, _ = self.dom.info()
+ return state==libvirt.VIR_DOMAIN_RUNNING
+ except:
+ logger.log_exc("in sliver_libvirt.is_running",name=self.name)
+ return False
def configure(self, rec):
@@ -135,54 +141,88 @@ class Sliver_Libvirt(Account):
# Btrfs support quota per volumes
- # It will depend on the FS selection
- if rec.has_key('disk_max'):
- disk_max = rec['disk_max']
- if disk_max == 0:
- # unlimited
- pass
+ if rec.has_key("rspec") and rec["rspec"].has_key("tags"):
+ if cgroups.get_cgroup_path(self.name) == None:
+ # If configure is called before start, then the cgroups won't exist
+ # yet. NM will eventually re-run configure on the next iteration.
+ # TODO: Add a post-start configure, and move this stuff there
+ logger.log("Configure: postponing tag check on %s as cgroups are not yet populated" % self.name)
else:
- # limit to certain number
- pass
-
- # Memory allocation
- if rec.has_key('memlock_hard'):
- mem = rec['memlock_hard'] * 1024 # hard limit in bytes
- cgroups.write(self.name, 'memory.limit_in_bytes', mem)
- if rec.has_key('memlock_soft'):
- mem = rec['memlock_soft'] * 1024 # soft limit in bytes
- cgroups.write(self.name, 'memory.soft_limit_in_bytes', mem)
-
- # CPU allocation
- # Only cpu_shares until figure out how to provide limits and guarantees
- # (RT_SCHED?)
- if rec.has_key('cpu_share'):
- cpu_share = rec['cpu_share']
- cgroups.write(self.name, 'cpu.shares', cpu_share)
+ tags = rec["rspec"]["tags"]
+ # It will depend on the FS selection
+ if tags.has_key('disk_max'):
+ disk_max = tags['disk_max']
+ if disk_max == 0:
+ # unlimited
+ pass
+ else:
+ # limit to certain number
+ pass
+
+ # Memory allocation
+ if tags.has_key('memlock_hard'):
+ mem = str(int(tags['memlock_hard']) * 1024) # hard limit in bytes
+ cgroups.write(self.name, 'memory.limit_in_bytes', mem, subsystem="memory")
+ if tags.has_key('memlock_soft'):
+ mem = str(int(tags['memlock_soft']) * 1024) # soft limit in bytes
+ cgroups.write(self.name, 'memory.soft_limit_in_bytes', mem, subsystem="memory")
+
+ # CPU allocation
+ # Only cpu_shares until figure out how to provide limits and guarantees
+ # (RT_SCHED?)
+ if tags.has_key('cpu_share'):
+ cpu_share = tags['cpu_share']
+ cgroups.write(self.name, 'cpu.shares', cpu_share)
# Call the upper configure method (ssh keys...)
Account.configure(self, rec)
+ @staticmethod
+ def get_unique_vif():
+ return 'veth%s' % random.getrandbits(32)
+
# A placeholder until we get true VirtualInterface objects
@staticmethod
def get_interfaces_xml(rec):
xml = """
+
-"""
+""" % (Sliver_Libvirt.get_unique_vif())
try:
tags = rec['rspec']['tags']
if 'interface' in tags:
- interface = eval(tags['interface'])
- if 'bridge' in interface:
- xml = """
-
-
-
-
-""" % interface['bridge']
- logger.log('sliver_libvirty.py: interface XML is: %s' % xml)
+ interfaces = eval(tags['interface'])
+ if not isinstance(interfaces, (list, tuple)):
+ # if interface is not a list, then make it into a singleton list
+ interfaces = [interfaces]
+ tag_xml = ""
+ for interface in interfaces:
+ if 'vlan' in interface:
+ vlanxml = "" % interface['vlan']
+ else:
+ vlanxml = ""
+ if 'bridge' in interface:
+ tag_xml = tag_xml + """
+
+
+ %s
+
+
+
+ """ % (interface['bridge'], vlanxml, Sliver_Libvirt.get_unique_vif())
+ else:
+ tag_xml = tag_xml + """
+
+
+
+
+ """ % (Sliver_Libvirt.get_unique_vif())
+
+ xml = tag_xml
+ logger.log('sliver_libvirty.py: interface XML is: %s' % xml)
+
except:
logger.log('sliver_libvirt.py: ERROR parsing "interface" tag for slice %s' % rec['name'])
logger.log('sliver_libvirt.py: tag value: %s' % tags['interface'])