From: asteroide <thomas.duval@orange.com>
Date: Fri, 2 Jun 2017 12:35:34 +0000 (+0200)
Subject: Fix hangs when there was a lot of connections in RabbitMQ
X-Git-Tag: opnfv-5.1.RC1~73
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F35727%2F1;p=moon.git

Fix hangs when there was a lot of connections in RabbitMQ

Change-Id: Ifaf5a363276b6087a96663cbff6d255781201c84
---

diff --git a/moonv4/moon_utilities/moon_utilities/security_functions.py b/moonv4/moon_utilities/moon_utilities/security_functions.py
index 5d66d927..c8ae094b 100644
--- a/moonv4/moon_utilities/moon_utilities/security_functions.py
+++ b/moonv4/moon_utilities/moon_utilities/security_functions.py
@@ -162,6 +162,8 @@ __n_notifier = oslo_messaging.Notifier(__n_transport,
                                        topics=['authz-workers'])
 __n_notifier = __n_notifier.prepare(publisher_id='router')
 
+__targets = {}
+
 
 def notify(request_id, container_id, payload, event_type="authz"):
     ctxt = {
@@ -177,14 +179,20 @@ def notify(request_id, container_id, payload, event_type="authz"):
 def call(endpoint, ctx=None, method="get_status", **kwargs):
     if not ctx:
         ctx = dict()
+    if endpoint not in __targets:
+        __targets[endpoint] = dict()
+        __targets[endpoint]["endpoint"] = oslo_messaging.Target(topic=endpoint, version='1.0')
+        __targets[endpoint]["client"] = dict()
+        __targets[endpoint]["client"]["internal"] = oslo_messaging.RPCClient(__transport,
+                                                                             __targets[endpoint]["endpoint"])
+        __targets[endpoint]["client"]["external"] = oslo_messaging.RPCClient(__transport_master,
+                                                                             __targets[endpoint]["endpoint"])
     if 'call_master' in ctx and ctx['call_master'] and CONF.slave.master_url:
-        transport = __transport_master
-        # LOG.info("Calling master {} on {}...".format(method, endpoint))
+        client = __targets[endpoint]["client"]["external"]
+        LOG.info("Calling master {} on {}...".format(method, endpoint))
     else:
-        transport = __transport
-        # LOG.info("Calling {} on {}...".format(method, endpoint))
-    target = oslo_messaging.Target(topic=endpoint, version='1.0')
-    client = oslo_messaging.RPCClient(transport, target)
+        client = __targets[endpoint]["client"]["internal"]
+        LOG.info("Calling {} on {}...".format(method, endpoint))
     return client.call(ctx, method, **kwargs)