Ensure releasing a session after pool has been cleared does not error (…

…#1071) * ensure releasing a session after pool has been cleared does not error * fix spacing
googleapis · May 25, 2018 · 78196c4 · 78196c4
1 parent 41ff6c4
commit 78196c4
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/Spanner/src/Session/CacheSessionPool.php b/Spanner/src/Session/CacheSessionPool.php
@@ -298,14 +298,17 @@ public function release(Session $session)
         $this->config['lock']->synchronize(function () use ($session) {
             $item = $this->cacheItemPool->getItem($this->cacheKey);
             $data = $item->get();
-
-            unset($data['inUse'][$session->name()]);
-            array_push($data['queue'], [
-                'name' => $session->name(),
-                'expiration' => $session->expiration()
-                    ?: $this->time() + SessionPoolInterface::SESSION_EXPIRATION_SECONDS
-            ]);
-            $this->cacheItemPool->save($item->set($data));
+            $name = $session->name();
+
+            if (isset($data['inUse'][$name])) {
+                unset($data['inUse'][$name]);
+                array_push($data['queue'], [
+                    'name' => $name,
+                    'expiration' => $session->expiration()
+                        ?: $this->time() + SessionPoolInterface::SESSION_EXPIRATION_SECONDS
+                ]);
+                $this->cacheItemPool->save($item->set($data));
+            }
         });
     }
 

diff --git a/Spanner/tests/Unit/Session/CacheSessionPoolTest.php b/Spanner/tests/Unit/Session/CacheSessionPoolTest.php
@@ -340,6 +340,27 @@ public function testClearPool()
         $this->assertNull($actualCacheData);
     }
 
+    public function testReleaseSessionAfterClearingPoolSucceeds()
+    {
+        $pool = new CacheSessionPoolStub($this->getCacheItemPool());
+        $pool->setDatabase($this->getDatabase());
+        $session = $pool->acquire();
+        $itemPool = $pool->cacheItemPool();
+        $pool->clear();
+        $cacheData = $itemPool->getItem(
+            sprintf(self::CACHE_KEY_TEMPLATE, self::PROJECT_ID, self::INSTANCE_NAME, self::DATABASE_NAME)
+        )->get();
+
+        $this->assertNull($cacheData);
+
+        $pool->release($session);
+        $cacheData = $itemPool->getItem(
+            sprintf(self::CACHE_KEY_TEMPLATE, self::PROJECT_ID, self::INSTANCE_NAME, self::DATABASE_NAME)
+        )->get();
+
+        $this->assertNull($cacheData);
+    }
+
     /**
      * @dataProvider acquireDataProvider
      */