X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fusr_share_openvswitch_scripts_ovs-xapi-sync;h=1c8ad51a4b18b665a536effb87b8274615308478;hb=HEAD;hp=8f5885a9878f085a8038f93d8dbddf04b1a4c32f;hpb=8084c0119cc9b6125697a316e03256d0d4555749;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 8f5885a98..1c8ad51a4 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, 2012 Nicira Networks +# Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -24,7 +24,6 @@ import argparse import os -import signal import sys import time @@ -36,11 +35,13 @@ from ovs.db import types import ovs.daemon import ovs.db.idl import ovs.unixctl +import ovs.unixctl.server vlog = ovs.vlog.Vlog("ovs-xapi-sync") session = None -force_run = False +flush_cache = False exiting = False +xapi_down = False def unixctl_exit(conn, unused_argv, unused_aux): @@ -49,6 +50,12 @@ def unixctl_exit(conn, unused_argv, unused_aux): conn.reply(None) +def unixctl_flush_cache(conn, unused_argv, unused_aux): + global flush_cache + flush_cache = True + conn.reply(None) + + # Set up a session to interact with XAPI. # # On system start-up, OVS comes up before XAPI, so we can't log into the @@ -76,13 +83,25 @@ def get_network_by_bridge(br_name): " XAPI session could not be initialized" % br_name) return None - for n in session.xenapi.network.get_all(): - rec = session.xenapi.network.get_record(n) - if rec['bridge'] == br_name: - return rec + recs = session.xenapi.network.get_all_records_where('field "bridge"="%s"' % br_name) + if len(recs) > 0: + return recs.values()[0] return None +# There are possibilities when multiple xs-network-uuids are set for a bridge. +# In cases like that, we should choose the bridge-id associated with the bridge +# name. +def get_single_bridge_id(bridge_ids, br_name, default=None): + global xapi_down + + rec = get_network_by_bridge(br_name) + if rec and rec['uuid'] in bridge_ids: + return rec['uuid'] + + vlog.warn("Failed to get a single bridge id from Xapi.") + xapi_down = True + return default # By default, the "bridge-id" external id in the Bridge table is the # same as "xs-network-uuids". This may be overridden by defining a @@ -157,6 +176,7 @@ def set_or_delete(d, key, value): def set_external_id(row, key, value): + row.verify("external_ids") external_ids = row.external_ids if set_or_delete(external_ids, key, value): row.external_ids = external_ids @@ -181,6 +201,7 @@ def update_fail_mode(row): if fail_mode not in ['standalone', 'secure']: fail_mode = 'standalone' + row.verify("fail_mode") if row.fail_mode != fail_mode: row.fail_mode = fail_mode @@ -192,6 +213,7 @@ def update_in_band_mgmt(row): dib = rec['other_config'].get('vswitch-disable-in-band') + row.verify("other_config") other_config = row.other_config if dib and dib not in ['true', 'false']: vlog.warn('"%s" isn\'t a valid setting for ' @@ -200,40 +222,8 @@ def update_in_band_mgmt(row): row.other_config = other_config -def keep_table_columns(schema, table_name, columns): - table = schema.tables.get(table_name) - if not table: - raise error.Error("schema has no %s table" % table_name) - - new_columns = {} - for column_name in columns: - column = table.columns.get(column_name) - if not column: - raise error.Error("%s table schema lacks %s column" - % (table_name, column_name)) - new_columns[column_name] = column - table.columns = new_columns - return table - - -def prune_schema(schema): - new_tables = {} - new_tables["Bridge"] = keep_table_columns( - schema, "Bridge", ("name", "external_ids", "other_config", - "fail_mode")) - new_tables["Interface"] = keep_table_columns( - schema, "Interface", ("name", "external_ids")) - schema.tables = new_tables - - -def handler(signum, _): - global force_run - if (signum == signal.SIGHUP): - force_run = True - - def main(): - global force_run + global flush_cache, xapi_down parser = argparse.ArgumentParser() parser.add_argument("database", metavar="DATABASE", @@ -249,15 +239,18 @@ def main(): ovs.daemon.handle_args(args) remote = args.database - schema_file = "%s/vswitch.ovsschema" % ovs.dirs.PKGDATADIR - schema = ovs.db.schema.DbSchema.from_json(ovs.json.from_file(schema_file)) - prune_schema(schema) - idl = ovs.db.idl.Idl(remote, schema) + schema_helper = ovs.db.idl.SchemaHelper() + schema_helper.register_columns("Bridge", ["name", "external_ids", + "other_config", "fail_mode"]) + schema_helper.register_columns("Interface", ["name", "external_ids"]) + idl = ovs.db.idl.Idl(remote, schema_helper) ovs.daemon.daemonize() ovs.unixctl.command_register("exit", "", 0, 0, unixctl_exit, None) - error, unixctl_server = ovs.unixctl.UnixctlServer.create(None) + ovs.unixctl.command_register("flush-cache", "", 0, 0, unixctl_flush_cache, + None) + error, unixctl_server = ovs.unixctl.server.UnixctlServer.create(None) if error: ovs.util.ovs_fatal(error, "could not create unixctl server", vlog) @@ -267,8 +260,6 @@ def main(): while not os.path.exists(cookie_file): time.sleep(1) - signal.signal(signal.SIGHUP, handler) - bridges = {} # Map from bridge name to nicira-bridge-id iface_ids = {} # Map from xs-vif-uuid to iface-id vm_ids = {} # Map from xs-vm-uuid to vm-id @@ -279,41 +270,51 @@ def main(): break; idl.run() - if not force_run and seqno == idl.change_seqno: + if not xapi_down and not flush_cache and seqno == idl.change_seqno: poller = ovs.poller.Poller() unixctl_server.wait(poller) idl.wait(poller) poller.block() continue - if force_run: - vlog.info("Forced to re-run as the result of a SIGHUP") + if xapi_down: + vlog.warn("Xapi is probably down. Retry again after a second.") + time.sleep(1) + xapi_down = False + + if flush_cache: + vlog.info("Flushing cache as the result of unixctl.") bridges = {} iface_ids = {} vm_ids = {} - force_run = False + flush_cache = False seqno = idl.change_seqno txn = ovs.db.idl.Transaction(idl) new_bridges = {} for row in idl.tables["Bridge"].rows.itervalues(): - if row.name in bridges: - nbd = bridges[row.name] - else: - # New bridge. + bridge_id = bridges.get(row.name) + if bridge_id is None: + # Configure the new bridge. update_fail_mode(row) update_in_band_mgmt(row) - nbd = get_bridge_id(row.name) - bridge_id = nbd - if bridge_id is None: - bridge_id = row.external_ids.get("xs-network-uuids") + # Get the correct bridge_id, if we can. + bridge_id = get_bridge_id(row.name) + if bridge_id is None: + xs_network_uuids = row.external_ids.get("xs-network-uuids") + if xs_network_uuids: + bridge_ids = xs_network_uuids.split(";") + if len(bridge_ids) == 1: + bridge_id = bridge_ids[0] + else: + bridge_id = get_single_bridge_id(bridge_ids, + row.name) + set_external_id(row, "bridge-id", bridge_id) if bridge_id is not None: - set_external_id(row, "bridge-id", bridge_id.split(";")[0]) - - new_bridges[row.name] = nbd + new_bridges[row.name] = bridge_id bridges = new_bridges iface_by_name = {} @@ -384,6 +385,7 @@ def main(): iface_ids = new_iface_ids vm_ids = new_vm_ids + txn.add_comment("ovs-xapi-sync: Updating records from XAPI") txn.commit_block() unixctl_server.close()