Fix mysql gone away issue - #1241 #1221 #1220

windwalker-io · Jun 16, 2024 · ad72023 · ad72023
1 parent b5333fd
commit ad72023
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 13 deletions.
diff --git a/src/Driver/AbstractDriver.php b/src/Driver/AbstractDriver.php
@@ -170,6 +170,21 @@ public function getConnection(bool $keep = false): ConnectionInterface
         return $conn;
     }
 
+    public function dropConnection(?ConnectionInterface $conn = null): static
+    {
+        if ($conn) {
+            $conn->release();
+
+            $this->getPool()->dropConnection($conn);
+        } elseif ($this->connection) {
+            $this->getPool()->dropConnection(
+                $this->releaseKeptConnection()
+            );
+        }
+
+        return $this;
+    }
+
     public function releaseKeptConnection(): ?ConnectionInterface
     {
         if ($this->connection) {
@@ -209,16 +224,18 @@ public function useConnection(callable $callback): mixed
         return $result;
     }
 
-    /**
-     * disconnect
-     *
-     * @return  int
-     */
     public function disconnectAll(): int
     {
         return $this->getPool()->close();
     }
 
+    public function disconnect(): static
+    {
+        $this->dropConnection();
+
+        return $this;
+    }
+
     /**
      * createStatement
      *

diff --git a/src/Driver/AbstractStatement.php b/src/Driver/AbstractStatement.php
@@ -169,6 +169,46 @@ public function execute(?array $params = null): static
      */
     abstract protected function doExecute(?array $params = null): bool;
 
+    protected function tryExecute(\Closure $handler)
+    {
+        return $this->driver->useConnection(
+            function (ConnectionInterface $conn) use ($handler) {
+                try {
+                    return $handler($conn);
+                } catch (\Exception $e) {
+                    if (!$this->shouldReconnect($e)) {
+                        throw $e;
+                    }
+
+                    $conn->reconnect();
+
+                    return $handler($conn);
+                }
+            }
+        );
+    }
+
+    protected function shouldReconnect(\Throwable $e): bool
+    {
+        $keywords = [
+            'has gone away',
+            'lost connection',
+            'went away',
+            'connection timed out',
+            'operation timed out'
+        ];
+
+        $message = strtolower($e->getMessage());
+
+        foreach ($keywords as $keyword) {
+            if (str_contains($message, strtolower($keyword))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * @inheritDoc
      */

diff --git a/src/Driver/Mysqli/MysqliStatement.php b/src/Driver/Mysqli/MysqliStatement.php
@@ -56,7 +56,7 @@ static function ($param) {
 
         [$query, $params] = BoundedHelper::replaceParams($this->query, '?', $params);
 
-        $this->driver->useConnection(
+        $this->tryExecute(
             function (ConnectionInterface $conn) use ($params, $query) {
                 $this->conn = $conn->get();
                 $this->cursor = $stmt = $this->conn->prepare($query);

diff --git a/src/Driver/Pdo/PdoStatement.php b/src/Driver/Pdo/PdoStatement.php
@@ -32,7 +32,7 @@ class PdoStatement extends AbstractStatement
      */
     protected function doExecute(?array $params = null): bool
     {
-        return $this->driver->useConnection(
+        return $this->tryExecute(
             function (ConnectionInterface $conn) use ($params) {
                 /** @var PDO $pdo */
                 $this->conn = $pdo = $conn->get();

diff --git a/src/Driver/Pgsql/PgsqlStatement.php b/src/Driver/Pgsql/PgsqlStatement.php
@@ -47,7 +47,7 @@ static function ($param) {
 
         [$query, $params] = BoundedHelper::replaceParams($this->query, '$%d', $params);
 
-        $this->driver->useConnection(
+        $this->tryExecute(
             function (ConnectionInterface $conn) use ($params, $query) {
                 $this->conn = $resource = $conn->get();
 
@@ -60,13 +60,13 @@ function (ConnectionInterface $conn) use ($params, $query) {
                 }
 
                 $this->cursor = pg_execute($resource, $stname, $args);
+
+                if (!$this->cursor) {
+                    throw new StatementException(pg_last_error());
+                }
             }
         );
 
-        if (!$this->cursor) {
-            throw new StatementException(pg_last_error());
-        }
-
         return true;
     }
 

diff --git a/src/Driver/Sqlsrv/SqlsrvStatement.php b/src/Driver/Sqlsrv/SqlsrvStatement.php
@@ -52,7 +52,7 @@ static function ($param) {
             $args[] = &$param['value'];
         }
 
-        return $this->driver->useConnection(
+        return $this->tryExecute(
             function (ConnectionInterface $conn) use ($args, $query) {
                 $this->conn = $resource = $conn->get();