bug #27318 [Cache] memcache connect should not add duplicate entries on sequential calls (Aleksey Prilipko)

nicolas-grekas · nicolas-grekas · commit 9a077ca60406 · 2018-06-04T22:06:51.000+02:00
This PR was submitted for the 3.3 branch but it was merged into the 3.4 branch instead (closes #27318). Discussion ---------- [Cache] memcache connect should not add duplicate entries on sequential calls | Q | A | ------------- | --- | Branch? | 3.4 (be careful when merging) | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | no | Fixed tickets | #27299 | License | MIT MemcachedCache::createConnection adds server to list of servers on every call. But resets this list only when it is not empty and does not match configured list. This leads to follow: after first call list contains correct entry. After second it has server entry twice. After third it clears list and set it with correct value. With combination of libmemcached bug (segfault on adding server after reset nonempty list) it makes impossible to use MemcachedCache::createConnection to create persistent connections. Commits ------- af06990 bug #27299 [Cache] memcache connect should not add duplicate entries on sequential calls
diff --git a/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php
@@ -45,6 +45,15 @@ public function createSimpleCache($defaultLifetime = 0)
         return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
 
+    public function testCreatePersistentConnectionShouldNotDupServerList()
+    {
+        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('persistent_id' => 'persistent'));
+        $this->assertCount(1, $instance->getServerList());
+
+        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('persistent_id' => 'persistent'));
+        $this->assertCount(1, $instance->getServerList());
+    }
+
     public function testOptions()
     {
         $client = MemcachedCache::createConnection(array(), array(
diff --git a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
@@ -169,12 +169,12 @@ public static function createConnection($servers, array $options = array())
                 }
 
                 if ($oldServers !== $newServers) {
-                    // before resetting, ensure $servers is valid
-                    $client->addServers($servers);
                     $client->resetServerList();
+                    $client->addServers($servers);
                 }
+            } else {
+                $client->addServers($servers);
             }
-            $client->addServers($servers);
 
             if (null !== $username || null !== $password) {
                 if (!method_exists($client, 'setSaslAuthData')) {

Original file line number	Diff line number	Diff line change
`@@ -169,12 +169,12 @@ public static function createConnection($servers, array $options = array())`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`if ($oldServers !== $newServers) {`
`172`		`- // before resetting, ensure $servers is valid`
`173`		`- $client->addServers($servers);`
`174`	`172`	`$client->resetServerList();`
	`173`	`+ $client->addServers($servers);`
`175`	`174`	`}`
	`175`	`+ } else {`
	`176`	`+ $client->addServers($servers);`
`176`	`177`	`}`
`177`		`- $client->addServers($servers);`
`178`	`178`
`179`	`179`	`if (null !== $username \|\| null !== $password) {`
`180`	`180`	`if (!method_exists($client, 'setSaslAuthData')) {`