From: Lucia Guevgeozian Odizzio <lucia.guevgeozian_odizzio@inria.fr>
Date: Mon, 27 Jan 2014 09:40:04 +0000 (+0100)
Subject: Adding flag when caching nodes, decrease waiting time
X-Git-Tag: nepi-3.1.0~137
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f92e25870aa32389a3a22dbc10737ccbac8db973;p=nepi.git

Adding flag when caching nodes, decrease waiting time
---

diff --git a/src/nepi/resources/planetlab/plcapi.py b/src/nepi/resources/planetlab/plcapi.py
index fed1a021..742c3f02 100644
--- a/src/nepi/resources/planetlab/plcapi.py
+++ b/src/nepi/resources/planetlab/plcapi.py
@@ -144,6 +144,7 @@ class PLCAPI(object):
         self._blacklist = set()
         self._reserved = set()
         self._nodes_cache = None
+        self._already_cached = False
 
         if session_key is not None:
             self.auth = dict(AuthMethod='session', session=session_key)
@@ -340,8 +341,12 @@ class PLCAPI(object):
             filters.update(kw)
 
             if not filters and not fieldstuple:
-                if not self._nodes_cache:
+                if not self._nodes_cache and not self._already_cached:
+                    self._already_cached = True
                     self._nodes_cache = _retry(self.mcapi.GetNodes)(self.auth)
+                elif not self._nodes_cache:
+                    while not self._nodes_cache:
+                        time.sleep(10)
                 return self._nodes_cache
 
             return _retry(self.mcapi.GetNodes)(self.auth, filters, *fieldstuple)