X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Fobjectcache%2FMemcachedPeclBagOStuff.php;h=e3e66d582617f310f6e54f82d09700e5e0d7dc63;hb=df3e3f44cb4464851d324a70d272858043223a1a;hp=5983c1b825cbf1985f8ee13158959ca4d7caaab3;hpb=3d653e8ab542e502f4dcf574c9e4917cf56a5f8c;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/libs/objectcache/MemcachedPeclBagOStuff.php b/includes/libs/objectcache/MemcachedPeclBagOStuff.php index 5983c1b825..e3e66d5826 100644 --- a/includes/libs/objectcache/MemcachedPeclBagOStuff.php +++ b/includes/libs/objectcache/MemcachedPeclBagOStuff.php @@ -29,8 +29,6 @@ class MemcachedPeclBagOStuff extends MemcachedBagOStuff { /** - * Constructor - * * Available parameters are: * - servers: The list of IP:port combinations holding the memcached servers. * - persistent: Whether to use a persistent connection @@ -149,7 +147,12 @@ class MemcachedPeclBagOStuff extends MemcachedBagOStuff { public function set( $key, $value, $exptime = 0, $flags = 0 ) { $this->debugLog( "set($key)" ); - return $this->checkResult( $key, parent::set( $key, $value, $exptime ) ); + $result = parent::set( $key, $value, $exptime ); + if ( $result === false && $this->client->getResultCode() === Memcached::RES_NOTSTORED ) { + // "Not stored" is always used as the mcrouter response with AllAsyncRoute + return true; + } + return $this->checkResult( $key, $result ); } protected function cas( $casToken, $key, $value, $exptime = 0 ) { @@ -163,9 +166,8 @@ class MemcachedPeclBagOStuff extends MemcachedBagOStuff { if ( $result === false && $this->client->getResultCode() === Memcached::RES_NOTFOUND ) { // "Not found" is counted as success in our interface return true; - } else { - return $this->checkResult( $key, $result ); } + return $this->checkResult( $key, $result ); } public function add( $key, $value, $exptime = 0 ) {