Add TTLCache for ListVCs (#619)

microsoft · Nov 2, 2019 · 194a12c · Anbang-Hu · Nov 2, 2019 · 194a12c
1 parent 86b5535
commit 194a12c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/src/ClusterManager/requirements.txt b/src/ClusterManager/requirements.txt
@@ -3,3 +3,4 @@ kubernetes==10.0.0
 PyYAML>=5.1.1
 prometheus-client==0.7.1
 twisted==19.2.1
+cachetools==3.1.1
diff --git a/src/RestAPI/dlwsrestapi.py b/src/RestAPI/dlwsrestapi.py
@@ -1225,6 +1225,7 @@ def endpoint_exist(endpoint_id):
         data_handler = DataHandler()
         for [_, endpoint] in endpoints.items():
             data_handler.UpdateEndpoint(endpoint)
+        data_handler.Close()
 
         resp = jsonify(endpoints)
         resp.headers["Access-Control-Allow-Origin"] = "*"
@@ -1290,6 +1291,7 @@ def post(self):
         dataHandler = DataHandler()
         ret = {}
         ret["result"] = dataHandler.UpdateTemplate(templateName, scope, json.dumps(template_json))
+        dataHandler.Close()
         resp = jsonify(ret)
         resp.headers["Access-Control-Allow-Origin"] = "*"
         resp.headers["dataType"] = "json"

diff --git a/src/utils/JobRestAPIUtils.py b/src/utils/JobRestAPIUtils.py
@@ -28,6 +28,7 @@
 
 import copy
 import logging
+from cachetools import cached, TTLCache
 
 
 DEFAULT_JOB_PRIORITY = 100
@@ -531,6 +532,7 @@ def AddVC(userName, vcName, quota, metadata):
     return ret
 
 
+@cached(cache=TTLCache(maxsize=81920, ttl=300))
 def ListVCs(userName):
     ret = []
     vcList =  DataManager.ListVCs()

diff --git a/src/utils/authorization.py b/src/utils/authorization.py
@@ -32,6 +32,7 @@ def enum(*sequential, **named):
 DEFAULT_EXPIRATION = 5 * 60
 
 
+# TODO: Replace with TTLCache in cachetools after refactoring
 class SimpleCache(object):
     def __init__(self, expiration=DEFAULT_EXPIRATION):
         self.expiration = expiration