From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 19 Aug 2016 03:53:20 +0000 (-0700)
Subject: Clarify some WANObjectCache docs
X-Git-Tag: 1.31.0-rc.0~5992
X-Git-Url: http://git.cyclocoop.org//%22%22.url_de_base%28%29.%22/%22?a=commitdiff_plain;h=d110a670824e139208d199d2d8ad87ca4e19d24c;p=lhc%2Fweb%2Fwiklou.git

Clarify some WANObjectCache docs

Change-Id: I819a630ebba4122a757f04fbf702122069af4fb1
---

diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
index 552c661df6..c40c819861 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -33,6 +33,7 @@ use Psr\Log\NullLogger;
  * This class is intended for caching data from primary stores.
  * If the get() method does not return a value, then the caller
  * should query the new value and backfill the cache using set().
+ * The preferred way to do this logic is through getWithSetCallback().
  * When querying the store on cache miss, the closest DB replica
  * should be used. Try to avoid heavyweight DB master or quorum reads.
  * When the source data changes, a purge method should be called.
@@ -47,8 +48,9 @@ use Psr\Log\NullLogger;
  *   - a) Configure the 'purge' EventRelayer to point to a valid PubSub endpoint
  *        that has subscribed listeners on the cache servers applying the cache updates.
  *   - b) Ignore the 'purge' EventRelayer configuration (default is NullEventRelayer)
- *        and set up mcrouter as the underlying cache backend. Using OperationSelectorRoute,
- *        configure 'set' and 'delete' operations to go to all DCs via AllAsyncRoute and
+ *        and set up mcrouter as the underlying cache backend, using one of the memcached
+ *        BagOStuff classes as 'cache'. Use OperationSelectorRoute in the mcrouter settings
+ *        to configure 'set' and 'delete' operations to go to all DCs via AllAsyncRoute and
  *        configure other operations to go to the local DC via PoolRoute (for reference,
  *        see https://github.com/facebook/mcrouter/wiki/List-of-Route-Handles).
  *
@@ -56,9 +58,9 @@ use Psr\Log\NullLogger;
  * in all datacenters this way, though the local one should likely be near immediate.
  *
  * This means that callers in all datacenters may see older values for however many
- * milliseconds the the purge took to reach that datacenter. As with any cache, this
+ * milliseconds that the purge took to reach that datacenter. As with any cache, this
  * should not be relied on for cases where reads are used to determine writes to source
- * (e.g. non-cache) data stores.
+ * (e.g. non-cache) data stores, except when reading immutable data.
  *
  * All values are wrapped in metadata arrays. Keys use a "WANCache:" prefix
  * to avoid collisions with keys that are not wrapped as metadata arrays. The