Use mcrouter for relcache and srmembercache

reddit-archive · Jul 18, 2016 · 9c371f0 · 9c371f0
1 parent eaafb10
commit 9c371f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 22 deletions.
diff --git a/install/setup_mcrouter.sh b/install/setup_mcrouter.sh
@@ -82,6 +82,9 @@ if [ ! -f /etc/mcrouter/global.conf ]; then
       "defaultsrs:": "local-pool",
       "featuredsrs:": "local-pool",
       "query:": "local-pool",
+      "rel:": "local-pool",
+      "srmember:": "local-pool",
+      "srmemberrel:": "local-pool",
     },
     "wildcard": {
       "type": "PoolRoute",

diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py
@@ -267,8 +267,6 @@ class Globals(object):
             'lockcaches',
             'permacache_memcaches',
             'memoizecaches',
-            'srmembercaches',
-            'relcaches',
             'ratelimitcaches',
             'hardcache_memcaches',
             'cassandra_seeds',
@@ -731,22 +729,6 @@ def setup(self):
             num_clients=num_mc_clients,
         )
 
-        # a pool just for srmember rels
-        srmembercaches = CMemcache(
-            "srmember",
-            self.srmembercaches,
-            min_compress_len=96,
-            num_clients=num_mc_clients,
-        )
-
-        # a pool just for rels
-        relcaches = CMemcache(
-            "rel",
-            self.relcaches,
-            min_compress_len=96,
-            num_clients=num_mc_clients,
-        )
-
         ratelimitcaches = CMemcache(
             "ratelimit",
             self.ratelimitcaches,
@@ -886,22 +868,22 @@ def setup(self):
             self.srmembercache = StaleCacheChain(
                 localcache_cls(),
                 stalecaches,
-                srmembercaches,
+                self.mcrouter,
             )
         else:
             self.srmembercache = MemcacheChain(
-                (localcache_cls(), srmembercaches))
+                (localcache_cls(), self.mcrouter))
         cache_chains.update(srmembercache=self.srmembercache)
 
         if stalecaches:
             self.relcache = StaleCacheChain(
                 localcache_cls(),
                 stalecaches,
-                relcaches,
+                self.mcrouter,
             )
         else:
             self.relcache = MemcacheChain(
-                (localcache_cls(), relcaches))
+                (localcache_cls(), self.mcrouter))
         cache_chains.update(relcache=self.relcache)
 
         self.ratelimitcache = MemcacheChain(