Changeset 107337 in webkit

Timestamp:

Feb 9, 2012, 6:19:55 PM (15 years ago)

Author:

rniwa@webkit.org

Message:

Perf-o-matic shouldn't rely on memcache to store cached JSON responses
​https://bugs.webkit.org/show_bug.cgi?id=78306

Reviewed by Adam Barth.

Added PersistentCache model that stores the generated JSON responses.

• Websites/webkit-perf.appspot.com/controller.py:

(set_persistent_cache):
(set_persistent_cache.execute):
(get_persistent_cache):
(cache_manifest):
(CachedManifestHandler.get):
(cache_dashboard):
(CachedDashboardHandler.get):
(cache_runs):
(CachedRunsHandler.get):

• Websites/webkit-perf.appspot.com/models.py:

(TestResult):
(ReportLog):
(PersistentCache):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Websites/webkit-perf.appspot.com/controller.py (modified) (6 diffs)
• Websites/webkit-perf.appspot.com/models.py (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-02-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Perf-o-matic shouldn't rely on memcache to store cached JSON responses
+        https://bugs.webkit.org/show_bug.cgi?id=78306
+
+        Reviewed by Adam Barth.
+
+        Added PersistentCache model that stores the generated JSON responses.
+
+        * Websites/webkit-perf.appspot.com/controller.py:
+        (set_persistent_cache):
+        (set_persistent_cache.execute):
+        (get_persistent_cache):
+        (cache_manifest):
+        (CachedManifestHandler.get):
+        (cache_dashboard):
+        (CachedDashboardHandler.get):
+        (cache_runs):
+        (CachedRunsHandler.get):
+        * Websites/webkit-perf.appspot.com/models.py:
+        (TestResult):
+        (ReportLog):
+        (PersistentCache):
+
 2012-02-09  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Websites/webkit-perf.appspot.com/controller.py

@@ -31 +31 @@
 from google.appengine.api import memcache
 from google.appengine.api import taskqueue
+from google.appengine.ext import db
 
 from models import Test
+from models import PersistentCache
+
+
+def set_persistent_cache(name, value):
+    memcache.set(name, value)
+
+    def execute():
+        cache = PersistentCache.get_by_key_name(name)
+        if cache:
+            cache.value = value
+            cache.put()
+        else:
+            PersistentCache(key_name=name, value=value).put()
+
+    db.run_in_transaction(execute)
+
+
+def get_persistent_cache(name):
+    value = memcache.get(name)
+    if value:
+        return value
+    cache = PersistentCache.get_by_key_name(name)
+    memcache.set(name, cache)
+    return cache.value
 
 
 def cache_manifest(cache):
-    memcache.set('manifest', cache)
+    set_persistent_cache('manifest', cache)
 
 
@@ -46 +71 @@
     def get(self):
         self.response.headers['Content-Type'] = 'application/json'
-        manifest = memcache.get('manifest')
+        manifest = get_persistent_cache('manifest')
         if manifest:
             self.response.out.write(manifest)
@@ -54 +79 @@
 
 def cache_dashboard(cache):
-    memcache.set('dashboard', cache)
+    set_persistent_cache('dashboard', cache)
 
 
@@ -64 +89 @@
     def get(self):
         self.response.headers['Content-Type'] = 'application/json'
-        dashboard = memcache.get('dashboard')
+        dashboard = get_persistent_cache('dashboard')
         if dashboard:
             self.response.out.write(dashboard)
@@ -72 +97 @@
 
 def cache_runs(test_id, branch_id, platform_id, cache):
-    memcache.set(Test.cache_key(test_id, branch_id, platform_id), cache)
+    set_persistent_cache(Test.cache_key(test_id, branch_id, platform_id), cache)
 
 
@@ -93 +118 @@
             platform_id = 0
 
-        runs = memcache.get(Test.cache_key(test_id, branch_id, platform_id))
+        runs = get_persistent_cache(Test.cache_key(test_id, branch_id, platform_id))
         if runs:
             self.response.out.write(runs)

trunk/Websites/webkit-perf.appspot.com/models.py

@@ -117 +117 @@
 
 
-# Temporarily log reports sent by bots
+# Temporarily store log reports sent by bots
 class ReportLog(db.Model):
     timestamp = db.DateTimeProperty(required=True)
     headers = db.TextProperty()
     payload = db.TextProperty()
+
+
+# Used when memcache entry is evicted
+class PersistentCache(db.Model):
+    value = db.TextProperty(required=True)