Delay mechanism

README.md

@@ -41,7 +41,8 @@ $connectionParams = array(
     'wrapperClass' => 'Facile\DoctrineMySQLComeBack\Doctrine\DBAL\Connection',
     'driverClass' => 'Facile\DoctrineMySQLComeBack\Doctrine\DBAL\Driver\PDOMySql\Driver',
     'driverOptions' => array(
-        'x_reconnect_attempts' => 3
+        'x_reconnect_attempts' => 3,
+        'x_reconnect_delay' => 1000000 // microseconds
     )
 );
 
@@ -69,6 +70,8 @@ doctrine:
                 driver_class: 'Facile\DoctrineMySQLComeBack\Doctrine\DBAL\Driver\PDOMySql\Driver'
                 options:
                     x_reconnect_attempts: 3
+                    # microseconds
+                    x_reconnect_delay: 1000000
 ```
 
 If you are setting up your database connection using a DSN/`database_url` env variable (like the Doctrine Symfony Flex recipe suggests) **you need to remove the protocol** from your database url.
@@ -87,6 +90,8 @@ doctrine:
                 driver_class: 'Facile\DoctrineMySQLComeBack\Doctrine\DBAL\Driver\PDOMySql\Driver'
                 options:
                     x_reconnect_attempts: 3
+                    # microseconds
+                    x_reconnect_delay: 1000000
 
 ``` 
 
@@ -108,6 +113,7 @@ return [
                     'charset' => 'UTF8',
                     'driverOptions' => [
                         'x_reconnect_attempts' => 9,
+                        'x_reconnect_delay' => 1000000 // microseconds
                     ]
                 ],
             ],

src/ConnectionTrait.php

@@ -24,6 +24,9 @@ trait ConnectionTrait
     /** @var int */
     protected $reconnectAttempts = 0;
 
+    /** @var int */
+    private $reconnectDelay = 0;
+
     /** @var ReflectionProperty|null */
     private $selfReflectionNestingLevelProperty;
 
@@ -56,6 +59,10 @@ public function __construct(
             $this->reconnectAttempts = (int)$params['driverOptions']['x_reconnect_attempts'];
         }
 
+        if (isset($params['driverOptions']['x_reconnect_delay'])) {
+            $this->reconnectDelay = (int)$params['driverOptions']['x_reconnect_delay'];
+        }
+
         parent::__construct($params, $driver, $config, $eventManager);
     }
 
@@ -81,6 +88,7 @@ public function executeQuery($query, array $params = array(), $types = array(),
             } catch (Exception $e) {
                 if ($this->canTryAgain($attempt) && $this->isRetryableException($e, $query)) {
                     $this->close();
+                    $this->delayReconnection();
                     ++$attempt;
                     $retry = true;
                 } else {
@@ -109,6 +117,7 @@ public function query()
             } catch (Exception $e) {
                 if ($this->canTryAgain($attempt) && $this->isRetryableException($e, $args[0])) {
                     $this->close();
+                    $this->delayReconnection();
                     ++$attempt;
                     $retry = true;
                 } else {
@@ -148,6 +157,7 @@ public function executeStatement($sql, array $params = [], array $types = [])
             } catch (Exception $e) {
                 if ($this->canTryAgain($attempt) && $this->isRetryableException($e)) {
                     $this->close();
+                    $this->delayReconnection();
                     ++$attempt;
                     $retry = true;
                 } else {
@@ -178,6 +188,7 @@ public function beginTransaction()
             } catch (Exception $e) {
                 if ($this->canTryAgain($attempt, true) && $this->_driver->isGoneAwayException($e)) {
                     $this->close();
+                    $this->delayReconnection();
                     if (0 < $this->getTransactionNestingLevel()) {
                         $this->resetTransactionNestingLevel();
                     }
@@ -279,6 +290,14 @@ private function resetTransactionNestingLevel()
         $this->selfReflectionNestingLevelProperty->setValue($this, 0);
     }
 
+    /**
+     * @return void
+     */
+    public function delayReconnection()
+    {
+        usleep($this->reconnectDelay);
+    }
+
     /**
      * @param string $query
      *
@@ -288,4 +307,4 @@ public function isUpdateQuery($query)
     {
         return !preg_match('/^[\s\n\r\t(]*(select|show|describe)[\s\n\r\t(]+/i', $query);
     }
-}
+}

src/Driver/Mysqli/Driver.php

@@ -19,6 +19,7 @@ class Driver extends \Doctrine\DBAL\Driver\Mysqli\Driver implements ServerGoneAw
      */
     private $extendedDriverOptions = [
         'x_reconnect_attempts',
+        'x_reconnect_delay'
     ];
 
     /**

src/Statement.php

@@ -49,6 +49,7 @@ public function __construct($sql, ConnectionInterface $conn)
             } catch (\Exception $e) {
                 if ($conn->canTryAgain($attempt) && $conn->isRetryableException($e, $sql)) {
                     $conn->close();
+                    $conn->delayReconnection();
                     ++$attempt;
                     $retry = true;
                 } else {
@@ -95,6 +96,7 @@ public function execute($params = null)
             } catch (\Exception $e) {
                 if ($this->conn->canTryAgain($attempt) && $this->conn->isRetryableException($e, $this->sql)) {
                     $this->conn->close();
+                    $this->conn->delayReconnection($attempt);
                     $this->recreateStatement();
                     ++$attempt;
                     $retry = true;

tests/functional/AbstractFunctionalTest.php

@@ -12,11 +12,11 @@
 
 abstract class AbstractFunctionalTest extends TestCase
 {
-    abstract protected function createConnection(int $attempts): Connection;
+    abstract protected function createConnection(int $attempts, int $delay): Connection;
 
-    protected function getConnectedConnection(int $attempts): Connection
+    protected function getConnectedConnection(int $attempts, int $delay = 0): Connection
     {
-        $connection = $this->createConnection($attempts);
+        $connection = $this->createConnection($attempts, $delay);
         $connection->query('SELECT 1');
 
         return $connection;
@@ -51,7 +51,7 @@ protected function getConnectionParams(): array
     /**
      * Disconnect other sessions
      */
-    protected function forceDisconnect(\Doctrine\DBAL\Connection $connection): void
+    protected function forceDisconnect(\Doctrine\DBAL\Connection $connection, int $delay = 0): void
     {
         /** @var Connection $connection */
         $connection2 = DriverManager::getConnection(array_merge(
@@ -60,7 +60,8 @@ protected function forceDisconnect(\Doctrine\DBAL\Connection $connection): void
                 'wrapperClass' => Connection::class,
                 'driverClass' => Driver::class,
                 'driverOptions' => array(
-                    'x_reconnect_attempts' => 1
+                    'x_reconnect_attempts' => 1,
+                    'x_reconnect_delay' => $delay,
                 )
             ]
         ));
@@ -94,6 +95,27 @@ public function testExecuteQueryShouldReconnect(): void
         $this->assertSame(2, $connection->connectCount);
     }
 
+    public function testExecuteQueryShouldReconnectWithDelay(): void
+    {
+        $delay = 2000000;
+
+        $preTiming = microtime(true);
+        $connection = $this->getConnectedConnection(1, $delay);
+        $this->assertSame(1, $connection->connectCount);
+        $this->forceDisconnect($connection, $delay);
+
+        $connection->executeQuery('SELECT 1')->fetch();
+        $this->assertSame(2, $connection->connectCount);
+        $this->forceDisconnect($connection, $delay);
+
+        $connection->executeQuery('SELECT 1')->fetch();
+        $this->assertSame(3, $connection->connectCount);
+
+        // If
+        $postTiming = microtime(true);
+        $this->assertGreaterThanOrEqual(4, $postTiming - $preTiming);
+    }
+
     public function testQueryShouldReconnect(): void
     {
         $connection = $this->getConnectedConnection(1);

tests/functional/MysqliTest.php

@@ -9,7 +9,7 @@
 
 class MysqliTest extends AbstractFunctionalTest
 {
-    protected function createConnection(int $attempts): Connection
+    protected function createConnection(int $attempts, int $delay): Connection
     {
         /** @var Connection $connection */
         $connection = DriverManager::getConnection(array_merge(
@@ -18,7 +18,8 @@ protected function createConnection(int $attempts): Connection
                 'wrapperClass' => Connection::class,
                 'driverClass' => Driver::class,
                 'driverOptions' => array(
-                    'x_reconnect_attempts' => $attempts
+                    'x_reconnect_attempts' => $attempts,
+                    'x_reconnect_delay' => $delay,
                 )
             ]
         ));

tests/functional/PDOMySqlTest.php

@@ -9,7 +9,7 @@
 
 class PDOMySqlTest extends AbstractFunctionalTest
 {
-    protected function createConnection(int $attempts): Connection
+    protected function createConnection(int $attempts, int $delay): Connection
     {
         /** @var Connection $connection */
         $connection = DriverManager::getConnection(array_merge(
@@ -18,7 +18,8 @@ protected function createConnection(int $attempts): Connection
                 'wrapperClass' => Connection::class,
                 'driverClass' => Driver::class,
                 'driverOptions' => array(
-                    'x_reconnect_attempts' => $attempts
+                    'x_reconnect_attempts' => $attempts,
+                    'x_reconnect_delay' => $delay,
                 )
             ]
         ));

tests/unit/ConnectionTest.php

@@ -53,7 +53,8 @@ public function testConstructor(): void
 
         $params = [
             'driverOptions' => [
-                'x_reconnect_attempts' => 999
+                'x_reconnect_attempts' => 999,
+                'x_reconnect_delay' => 1000,
             ],
             'platform' => $platform->reveal()
         ];