X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fusr_share_openvswitch_scripts_ovs-xapi-sync;h=649ddbe536521d870b247e6e953be4b3606391c1;hb=91a9863c4512d2e03378f4ea21c1662e503d2899;hp=e14b319b1aa69961c88755d9e2740ab48a83cd72;hpb=19af927238fbeaa664c504dab565e9b8c85cb8b4;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 e14b319b1..649ddbe53 100755
--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
+++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
@@ -41,6 +41,7 @@ vlog = ovs.vlog.Vlog("ovs-xapi-sync")
 session = None
 flush_cache = False
 exiting = False
+xapi_down = False
 
 
 def unixctl_exit(conn, unused_argv, unused_aux):
@@ -92,20 +93,33 @@ def get_network_by_bridge(br_name):
 # In cases like that, we should choose the bridge-id whose PIF does not have a
 # VLAN associated with it.
 def get_single_bridge_id(bridge_ids, default=None):
+    global xapi_down
     if not init_session():
         vlog.warn("Failed to get single bridge id from %s because"
                   "XAPI session could not be initialized" % bridge_ids)
         return default
 
     for bridge_id in bridge_ids:
-       recs = session.xenapi.network.get_all_records_where('field "uuid"="%s"' % bridge_id)
-       if recs:
-           pifs = recs.values()[0]['PIFs']
-           for pif in pifs:
-               rec = session.xenapi.PIF.get_record(pif)
-               if rec['VLAN'] == '-1':
-                   return bridge_id
+        try:
+            recs = session.xenapi.network.get_all_records_where(\
+                                            'field "uuid"="%s"' % bridge_id)
+            if recs:
+                pifs = recs.values()[0]['PIFs']
+                for pif in pifs:
+                    try:
+                        rec = session.xenapi.PIF.get_record(pif)
+                        if rec['VLAN'] == '-1':
+                            return bridge_id
+                    except XenAPI.Failure:
+                        vlog.warn("Could not find XAPI entry for PIF %s" % pif)
+                        continue
+
+        except XenAPI.Failure:
+            vlog.warn("Could not find XAPI entry for bridge_id %s" % bridge_id)
+            continue
 
+    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
@@ -228,7 +242,7 @@ def update_in_band_mgmt(row):
 
 
 def main():
-    global flush_cache
+    global flush_cache, xapi_down
 
     parser = argparse.ArgumentParser()
     parser.add_argument("database", metavar="DATABASE",
@@ -275,13 +289,18 @@ def main():
             break;
 
         idl.run()
-        if not flush_cache 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 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 = {}
@@ -307,7 +326,7 @@ def main():
                 bridge_id = row.external_ids.get("xs-network-uuids")
                 if bridge_id and len(bridge_id.split(";")) > 1:
                     bridge_ids = bridge_id.split(";")
-                    bridge_id = get_single_bridge_id(bridge_ids, bridge_ids[0])
+                    bridge_id = get_single_bridge_id(bridge_ids, "")
 
             if bridge_id is not None:
                 set_external_id(row, "bridge-id", bridge_id.split(";")[0])