Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optimize Xend acesseses

Browse Source 
Open Xend session only once, cache various intermediary Xen API
objects for faster access. This all is important for Qubes Manager, so that it
doesn'tintroduce too much load on Dom0's CPU when displaying the load chart.
This commit is contained in:
Joanna Rutkowska 2010-05-07 15:42:34 +02:00
parent c8f220b1fc
commit df82fa8282
1 changed files with 61 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
dom0/qvm-core/qubes.py
View File

@ -85,18 +85,28 @@ VM_TEMPLATE = 'TempleteVM'
VM_APPVM = 'AppVM' VM_APPVM = 'AppVM'
VM_NETVM = 'NetVM' VM_NETVM = 'NetVM'
def get_xend_session_old_api(): class XendSession(object):
from xen.xend import XendClient def __init__(self):
from xen.util.xmlrpcclient import ServerProxy self.get_xend_session_old_api()
xend_server = ServerProxy(XendClient.uri) self.get_xend_session_new_api()
return xend_server
def get_xend_session_new_api(): def get_xend_session_old_api(self):
xend_socket_uri = "httpu:///var/run/xend/xen-api.sock" from xen.xend import XendClient
session = XenAPI.Session (xend_socket_uri) from xen.util.xmlrpcclient import ServerProxy
session.login_with_password ("", "") self.xend_server = ServerProxy(XendClient.uri)
return session if self.xend_server is None:
print "get_xend_session_old_api(): cannot open session!"
def get_xend_session_new_api(self):
xend_socket_uri = "httpu:///var/run/xend/xen-api.sock"
self.session = XenAPI.Session (xend_socket_uri)
self.session.login_with_password ("", "")
if self.session is None:
print "get_xend_session_new_api(): cannot open session!"
xend_session = XendSession()
class QubesException (Exception) : pass class QubesException (Exception) : pass
@ -167,6 +177,14 @@ class QubesVm(object):
self.label = label if label is not None else QubesVmLabels["red"] self.label = label if label is not None else QubesVmLabels["red"]
self.icon_path = self.dir_path + "/icon.png" self.icon_path = self.dir_path + "/icon.png"
if not dry_run and xend_session.session is not None:
uuids = xend_session.session.xenapi.VM.get_by_name_label (self.name)
self.session_uuid = uuids[0] if len (uuids) > 0 else None
if self.session_uuid is not None:
self.session_metrics = xend_session.session.xenapi.VM.get_metrics(self.session_uuid)
else:
self.session_metrics = None
@property @property
def qid(self): def qid(self):
return self.__qid return self.__qid
@ -259,35 +277,35 @@ class QubesVm(object):
self.remove_from_xen_storage() self.remove_from_xen_storage()
self.add_to_xen_storage() self.add_to_xen_storage()
if not dry_run and xend_session.session is not None:
uuids = xend_session.session.xenapi.VM.get_by_name_label (self.name)
self.session_uuid = uuids[0] if len (uuids) > 0 else None
if self.session_uuid is not None:
self.session_metrics = xend_session.session.xenapi.VM.get_metrics(self.session_uuid)
else:
self.session_metrics = None
def get_xid(self): def get_xid(self):
if dry_run: if dry_run:
return 666 return 666
session = get_xend_session_new_api() xid = int (xend_session.session.xenapi.VM.get_domid (self.session_uuid))
uuids = session.xenapi.VM.get_by_name_label (self.name)
uuid = uuids[0]
xid = int (session.xenapi.VM.get_domid (uuid))
return xid return xid
def get_mem(self): def get_mem(self):
if dry_run: if dry_run:
return 666 return 666
session = get_xend_session_new_api() mem = int (xend_session.session.xenapi.VM_metrics.get_memory_actual (self.session_metrics))
uuids = session.xenapi.VM.get_by_name_label (self.name)
uuid = uuids[0]
metrics = session.xenapi.VM.get_metrics(uuid)
mem = int (session.xenapi.VM_metrics.get_memory_actual (metrics))
return mem return mem
def get_mem_static_max(self): def get_mem_static_max(self):
if dry_run: if dry_run:
return 666 return 666
session = get_xend_session_new_api() mem = int(xend_session.session.xenapi.VM.get_memory_static_max(self.session_uuid))
uuids = session.xenapi.VM.get_by_name_label (self.name)
uuid = uuids[0]
mem = int(session.xenapi.VM.get_memory_static_max(uuid))
return mem return mem
@ -296,11 +314,7 @@ class QubesVm(object):
import random import random
return random.random() * 100 return random.random() * 100
session = get_xend_session_new_api() cpus_util = xend_session.session.xenapi.VM_metrics.get_VCPUs_utilisation (self.session_metrics)
uuids = session.xenapi.VM.get_by_name_label (self.name)
uuid = uuids[0]
metrics = session.xenapi.VM.get_metrics(uuid)
cpus_util = session.xenapi.VM_metrics.get_VCPUs_utilisation (metrics)
if len (cpus_util) == 0: if len (cpus_util) == 0:
return 0 return 0
@ -317,13 +331,10 @@ class QubesVm(object):
if dry_run: if dry_run:
return "NA" return "NA"
if self.session_uuid is None:
session = get_xend_session_new_api()
uuids = session.xenapi.VM.get_by_name_label (self.name)
if len (uuids) == 0:
return "NA" return "NA"
uuid = uuids[0]
power_state = session.xenapi.VM.get_power_state (uuid) power_state = xend_session.session.xenapi.VM.get_power_state (self.session_uuid)
return power_state return power_state
def is_running(self): def is_running(self):
@ -400,10 +411,10 @@ class QubesVm(object):
else: else:
pass pass
def get_free_xen_memory(self, session): def get_free_xen_memory(self):
hosts = session.xenapi.host.get_all() hosts = xend_session.session.xenapi.host.get_all()
host_record = session.xenapi.host.get_record(hosts[0]) host_record = xend_session.session.xenapi.host.get_record(hosts[0])
host_metrics_record = session.xenapi.host_metrics.get_record(host_record["metrics"]) host_metrics_record = xend_session.session.xenapi.host_metrics.get_record(host_record["metrics"])
ret = host_metrics_record["memory_free"] ret = host_metrics_record["memory_free"]
return long(ret) return long(ret)
@ -418,15 +429,12 @@ class QubesVm(object):
print "--> Rereading the VM's conf file ({0})...".format(self.conf_file) print "--> Rereading the VM's conf file ({0})...".format(self.conf_file)
self.update_xen_storage() self.update_xen_storage()
session = get_xend_session_new_api()
uuids = session.xenapi.VM.get_by_name_label (self.name)
uuid = uuids[0]
if verbose: if verbose:
print "--> Loading the VM (type = {0})...".format(self.type) print "--> Loading the VM (type = {0})...".format(self.type)
mem_required = self.get_mem_static_max() mem_required = self.get_mem_static_max()
dom0_mem = dom0_vm.get_mem() dom0_mem = dom0_vm.get_mem()
dom0_mem_new = dom0_mem - mem_required + self.get_free_xen_memory(session) dom0_mem_new = dom0_mem - mem_required + self.get_free_xen_memory()
if verbose: if verbose:
print "--> AppVM required mem : {0}".format(mem_required) print "--> AppVM required mem : {0}".format(mem_required)
print "--> Dom0 mem after launch : {0}".format(dom0_mem_new) print "--> Dom0 mem after launch : {0}".format(dom0_mem_new)
@ -434,8 +442,8 @@ class QubesVm(object):
if dom0_mem_new < dom0_min_memory: if dom0_mem_new < dom0_min_memory:
raise MemoryError ("ERROR: starting this VM would cause Dom0 memory to go below {0}B".format(dom0_min_memory)) raise MemoryError ("ERROR: starting this VM would cause Dom0 memory to go below {0}B".format(dom0_min_memory))
session.xenapi.VM.start (uuid, True) # Starting a VM paused xend_session.session.xenapi.VM.start (self.session_uuid, True) # Starting a VM paused
xid = int (session.xenapi.VM.get_domid (uuid)) xid = int (xend_session.session.xenapi.VM.get_domid (self.session_uuid))
if verbose: if verbose:
print "--> Setting Xen Store info for the VM..." print "--> Setting Xen Store info for the VM..."
@ -464,7 +472,7 @@ class QubesVm(object):
if verbose: if verbose:
print "--> Starting the VM..." print "--> Starting the VM..."
session.xenapi.VM.unpause (uuid) xend_session.session.xenapi.VM.unpause (self.session_uuid)
# perhaps we should move it before unpause and fork? # perhaps we should move it before unpause and fork?
if debug_console: if debug_console:
@ -479,11 +487,7 @@ class QubesVm(object):
if dry_run: if dry_run:
return return
xend_session.session.xenapi.VM.hard_shutdown (self.session_uuid)
session = get_xend_session_new_api()
uuids = session.xenapi.VM.get_by_name_label (self.name)
uuid = uuids[0]
session.xenapi.VM.hard_shutdown (uuid)
def remove_from_disk(self): def remove_from_disk(self):
if dry_run: if dry_run:
@ -821,6 +825,10 @@ class QubesDom0NetVm(QubesNetVm):
dir_path=None, root_img = None, dir_path=None, root_img = None,
private_img = None, private_img = None,
label = default_template_label) label = default_template_label)
if not dry_run and xend_session.session is not None:
self.session_hosts = xend_session.session.xenapi.host.get_all()
self.session_cpus = xend_session.session.xenapi.host.get_host_CPUs(self.session_hosts[0])
def is_running(self): def is_running(self):
return True return True
@ -830,13 +838,10 @@ class QubesDom0NetVm(QubesNetVm):
import random import random
return random.random() * 100 return random.random() * 100
session = get_xend_session_new_api()
hosts = session.xenapi.host.get_all()
cpus = session.xenapi.host.get_host_CPUs(hosts[0])
cpu_total_load = 0.0 cpu_total_load = 0.0
for cpu in cpus: for cpu in self.session_cpus:
cpu_total_load += session.xenapi.host_cpu.get_utilisation(cpu) cpu_total_load += xend_session.session.xenapi.host_cpu.get_utilisation(cpu)
cpu_total_load /= len(cpus) cpu_total_load /= len(self.session_cpus)
p = 100*cpu_total_load p = 100*cpu_total_load
if p > 100: if p > 100:
p = 100 p = 100