Merge "Do no process any networks/interfaces until done with ifmap se…

…arch" into R2.22.x
Juniper · Feb 11, 2016 · 2eb8178 · 2eb8178
2 parents 3298dd9 + 2131065
commit 2eb8178
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/config/common/vnc_db.py b/src/config/common/vnc_db.py
@@ -30,6 +30,11 @@ def __iter__(cls):
                 yield i
         # end __iter__
 
+        def keys(cls):
+            for i in cls._dict.keys():
+                yield i
+        # end values
+
         def values(cls):
             for i in cls._dict.values():
                 yield i

diff --git a/src/config/schema-transformer/to_bgp.py b/src/config/schema-transformer/to_bgp.py
@@ -3151,6 +3151,8 @@ def process_poll_result(self, poll_result_str):
             if result_type != 'searchResult' and not self.ifmap_search_done:
                 self.ifmap_search_done = True
                 self.process_stale_objects()
+                self.current_network_set = VirtualNetworkST.keys()
+                something_done = True
             for meta in metas:
                 meta_name = re.sub('{.*}', '', meta.tag)
                 if result_type == 'deleteResult':
@@ -3174,7 +3176,11 @@ def process_poll_result(self, poll_result_str):
         if not something_done:
             _sandesh._logger.debug("Process IF-MAP: Nothing was done, skip.")
             return
+        if self.ifmap_search_done:
+            self.process_networks()
+    # end process_poll_results
 
+    def process_networks(self):
         # Second pass to construct ACL entries and connectivity table
         for network_name in self.current_network_set:
             virtual_network = VirtualNetworkST.get(network_name)
@@ -3457,6 +3463,14 @@ def reset():
 # end class SchemaTransformer
 
 
+def set_ifmap_search_done(transformer):
+    gevent.sleep(60)
+    transformer.ifmap_search_done = True
+    transformer.process_stale_objects()
+    transformer.current_network_set = list(VirtualNetworkST.keys())
+    transformer.process_networks()
+# end set_ifmap_search_done
+
 def launch_arc(transformer, ssrc_mapc):
     arc_mapc = arc_initialize(transformer._args, ssrc_mapc)
     while True:
@@ -3466,7 +3480,12 @@ def launch_arc(transformer, ssrc_mapc):
                 time.sleep(1)
                 continue
             pollreq = PollRequest(arc_mapc.get_session_id())
+            glet = None
+            if not transformer.ifmap_search_done:
+                glet = gevent.spawn(set_ifmap_search_done, transformer)
             result = arc_mapc.call('poll', pollreq)
+            if glet:
+                glet.kill()
             transformer.process_poll_result(result)
         except Exception as e:
             if type(e) == socket.error:
@@ -3491,6 +3510,7 @@ def launch_arc(transformer, ssrc_mapc):
 def launch_ssrc(transformer):
     while True:
         ssrc_mapc = ssrc_initialize(transformer._args)
+        transformer.ifmap_search_done = False
         transformer.arc_task = gevent.spawn(launch_arc, transformer, ssrc_mapc)
         transformer.arc_task.join()
 # end launch_ssrc