X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fusr_share_openvswitch_scripts_ovs-xapi-sync;h=0ffccc2da9619d20ee0b29831b071c2a233902c0;hb=a8a4d9565ba652b2f610ffad4e78d1f9068248ad;hp=1a174a05d62bc987304b5b5ca7d9af24ecb9c397;hpb=b153e667907ed68164a15207ad5f91ad4c39927c;p=sliver-openvswitch.git diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync index 1a174a05d..0ffccc2da 100755 --- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync +++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2009, 2010, 2011 Nicira Networks +# Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,11 +23,8 @@ # - Set the fail-mode on internal bridges. import argparse -import logging -import logging.handlers import os import signal -import subprocess import sys import time @@ -36,13 +33,11 @@ import XenAPI import ovs.dirs from ovs.db import error from ovs.db import types -import ovs.util import ovs.daemon import ovs.db.idl root_prefix = '' # Prefix for absolute file names, for testing. -s_log = logging.getLogger("ovs-xapi-sync") -vsctl = "/usr/bin/ovs-vsctl" +vlog = ovs.vlog.Vlog("ovs-xapi-sync") session = None force_run = False @@ -62,7 +57,7 @@ def init_session(): session.xenapi.login_with_password("", "") except XenAPI.Failure, e: session = None - s_log.warning("Couldn't login to XAPI (%s)" % e) + vlog.warn("Couldn't login to XAPI (%s)" % e) return False return True @@ -70,7 +65,7 @@ def init_session(): def get_network_by_bridge(br_name): if not init_session(): - s_log.warning("Failed to get bridge id %s because" + vlog.warn("Failed to get bridge id %s because" " XAPI session could not be initialized" % br_name) return None @@ -105,7 +100,7 @@ def get_iface_id(if_name, xs_vif_uuid): return xs_vif_uuid if not init_session(): - s_log.warning("Failed to get interface id %s because" + vlog.warn("Failed to get interface id %s because" " XAPI session could not be initialized" % if_name) return xs_vif_uuid @@ -114,15 +109,32 @@ def get_iface_id(if_name, xs_vif_uuid): rec = session.xenapi.VIF.get_record(vif) return rec['other_config'].get('nicira-iface-id', xs_vif_uuid) except XenAPI.Failure: - s_log.warning("Could not find XAPI entry for VIF %s" % if_name) + vlog.warn("Could not find XAPI entry for VIF %s" % if_name) return xs_vif_uuid -def call_vsctl(args): - cmd = [vsctl, "--timeout=30", "-vANY:console:off"] + args - exitcode = subprocess.call(cmd) - if exitcode != 0: - s_log.warning("Couldn't call ovs-vsctl") +# By default, the "vm-id" external id in the Interface table is the +# same as "xs-vm-uuid". This may be overridden by defining a +# "nicira-vm-id" key in the "other_config" field of the VM +# record of XAPI. +def get_vm_id(if_name, xs_vm_uuid): + if not if_name.startswith("vif") and not if_name.startswith("tap"): + # Treat whatever was passed into 'xs_vm_uuid' as a default + # value for non-VIFs. + return xs_vm_uuid + + if not init_session(): + vlog.warn("Failed to get vm id for interface id %s because" + " XAPI session could not be initialized" % if_name) + return xs_vm_uuid + + try: + vm = session.xenapi.VM.get_by_uuid(xs_vm_uuid) + rec = session.xenapi.VM.get_record(vm) + return rec['other_config'].get('nicira-vm-id', xs_vm_uuid) + except XenAPI.Failure: + vlog.warn("Could not find XAPI entry for VIF %s" % if_name) + return xs_vm_uuid def set_or_delete(d, key, value): @@ -175,8 +187,8 @@ def update_in_band_mgmt(row): other_config = row.other_config if dib and dib not in ['true', 'false']: - s_log.warning('"%s" isn\'t a valid setting for ' - "other_config:disable-in-band on %s" % (dib, row.name)) + vlog.warn('"%s" isn\'t a valid setting for ' + "other_config:disable-in-band on %s" % (dib, row.name)) elif set_or_delete(other_config, 'disable-in-band', dib): row.other_config = other_config @@ -224,18 +236,6 @@ def handler(signum, _): def main(): global force_run - s_log.addHandler(logging.StreamHandler()) - try: - l_handler = logging.handlers.RotatingFileHandler( - "/var/log/openvswitch/ovs-xapi-sync.log") - l_formatter = logging.Formatter('%(filename)s: %(levelname)s: %(message)s') - l_handler.setFormatter(l_formatter) - s_log.addHandler(l_handler) - except IOError, e: - logging.basicConfig() - s_log.warn("failed to open logfile (%s)" % e) - s_log.setLevel(logging.INFO) - parser = argparse.ArgumentParser() parser.add_argument("database", metavar="DATABASE", help="A socket on which ovsdb-server is listening.") @@ -243,12 +243,15 @@ def main(): help="Use DIR as alternate root directory" " (for testing).") + ovs.vlog.add_args(parser) ovs.daemon.add_args(parser) args = parser.parse_args() + ovs.vlog.handle_args(args) ovs.daemon.handle_args(args) global root_prefix - root_prefix = args.root_prefix + if args.root_prefix: + root_prefix = args.root_prefix remote = args.database schema_file = "%s/vswitch.ovsschema" % ovs.dirs.PKGDATADIR @@ -267,19 +270,24 @@ def main(): signal.signal(signal.SIGHUP, handler) bridges = {} # Map from bridge name to xs_network_uuids - interfaces = {} # Map from interface name to xs-vif-uuid + iface_ids = {} # Map from xs-vif-uuid to iface-id + vm_ids = {} # Map from xs-vm-uuid to vm-id + seqno = idl.change_seqno # Sequence number when we last processed the db while True: - if not force_run and not idl.run(): + idl.run() + if not force_run and seqno == idl.change_seqno: poller = ovs.poller.Poller() idl.wait(poller) poller.block() continue if force_run: - s_log.info("Forced to re-run as the result of a SIGHUP") + vlog.info("Forced to re-run as the result of a SIGHUP") bridges = {} - interfaces = {} + iface_ids = {} + vm_ids = {} force_run = False + seqno = idl.change_seqno txn = ovs.db.idl.Transaction(idl) @@ -291,9 +299,8 @@ def main(): # New bridge. update_fail_mode(row) update_in_band_mgmt(row) - if new_xnu != old_xnu: - # New bridge or bridge's xs-network-uuids has changed. - update_bridge_id(row) + + update_bridge_id(row) new_bridges[row.name] = new_xnu bridges = new_bridges @@ -301,7 +308,8 @@ def main(): for row in idl.tables["Interface"].rows.itervalues(): iface_by_name[row.name] = row - new_interfaces = {} + new_iface_ids = {} + new_vm_ids = {} for row in idl.tables["Interface"].rows.itervalues(): # Match up paired vif and tap devices. if row.name.startswith("vif"): @@ -322,17 +330,31 @@ def main(): for k in keys: set_external_id(row, k, vif.external_ids.get(k)) - # If it's a new interface or its xs-vif-uuid has changed, then - # obtain the iface-id from XAPI. + # Map from xs-vif-uuid to iface-id. # # (A tap's xs-vif-uuid comes from its vif. That falls out # naturally from the copy loop above.) - new_xvu = row.external_ids.get("xs-vif-uuid", "") - old_xvu = interfaces.get(row.name) - if old_xvu != new_xvu: - iface_id = get_iface_id(row.name, new_xvu) - if iface_id and row.external_ids.get("iface-id") != iface_id: - set_external_id(row, "iface-id", iface_id) + xvu = row.external_ids.get("xs-vif-uuid") + if xvu: + iface_id = (new_iface_ids.get(xvu) + or iface_ids.get(xvu) + or get_iface_id(row.name, xvu)) + new_iface_ids[xvu] = iface_id + else: + # No xs-vif-uuid therefore no iface-id. + iface_id = None + set_external_id(row, "iface-id", iface_id) + + # Map from xs-vm-uuid to vm-id. + xvmu = row.external_ids.get("xs-vm-uuid") + if xvmu: + vm_id = (new_vm_ids.get(xvmu) + or vm_ids.get(xvmu) + or get_vm_id(row.name, xvmu)) + new_vm_ids[xvmu] = vm_id + else: + vm_id = None + set_external_id(row, "vm-id", vm_id) # When there's a vif and a tap, the tap is active (used for # traffic). When there's just a vif, the vif is active. @@ -347,9 +369,8 @@ def main(): set_external_id(vif, "iface-status", "active") else: set_external_id(row, "iface-status", None) - - new_interfaces[row.name] = new_xvu - interfaces = new_interfaces + iface_ids = new_iface_ids + vm_ids = new_vm_ids txn.commit_block() @@ -361,5 +382,5 @@ if __name__ == '__main__': # Let system.exit() calls complete normally raise except: - s_log.exception("traceback") + vlog.exception("traceback") sys.exit(ovs.daemon.RESTART_EXIT_CODE)