[Messenger] Remove configuration for redelivery_max_count

surikman · surikman · commit c64f5aecf261 · 2019-08-17T10:37:27.000+02:00
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineReceiverTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineReceiverTest.php
@@ -75,28 +75,18 @@ public function testOccursRetryableExceptionFromConnection()
     {
         $serializer = $this->createSerializer();
         $connection = $this->createMock(Connection::class);
-        $connection->method('getConfiguration')->willReturn([
-            'redelivery_max_count' => 3,
-        ]);
         $driverException = new PDOException(new \PDOException('Deadlock', 40001));
         $connection->method('get')->willThrowException(new DeadlockException('Deadlock', $driverException));
         $receiver = new DoctrineReceiver($connection, $serializer);
-        $actualEnvelopes = $receiver->get();
-        $this->assertSame([], $actualEnvelopes);
-    }
-
-    public function testOccursRetryableExceptionAfterMaxCountFromConnection()
-    {
-        $serializer = $this->createSerializer();
-        $connection = $this->createMock(Connection::class);
-        $connection->method('getConfiguration')->willReturn([
-            'redelivery_max_count' => 2,
-        ]);
-        $driverException = new PDOException(new \PDOException('Deadlock', 40001));
-        $connection->method('get')->willThrowException(new DeadlockException('Deadlock', $driverException));
-        $receiver = new DoctrineReceiver($connection, $serializer);
-        $actualEnvelopes = $receiver->get();
-        $this->assertSame([], $actualEnvelopes);
+        $this->assertSame([], $receiver->get());
+        $this->assertSame([], $receiver->get());
+        try {
+            $receiver->get();
+        } catch (TransportException $exception) {
+            // skip, and retry
+        }
+        $this->assertSame([], $receiver->get());
+        $this->assertSame([], $receiver->get());
         $this->expectException(TransportException::class);
         $receiver->get();
     }
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
@@ -36,7 +36,6 @@ class Connection
         'queue_name' => 'default',
         'redeliver_timeout' => 3600,
         'auto_setup' => true,
-        'redelivery_max_count' => 3,
     ];
 
     /**
@@ -80,7 +79,6 @@ public static function buildConfiguration($dsn, array $options = [])
         $configuration = ['connection' => $components['host']];
         $configuration += $options + $query + self::DEFAULT_OPTIONS;
 
-        $configuration['redelivery_max_count'] = filter_var($configuration['redelivery_max_count'], FILTER_VALIDATE_INT);
         $configuration['auto_setup'] = filter_var($configuration['auto_setup'], FILTER_VALIDATE_BOOLEAN);
 
         // check for extra keys in options
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineReceiver.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineReceiver.php
@@ -31,6 +31,7 @@
  */
 class DoctrineReceiver implements ReceiverInterface, MessageCountAwareInterface, ListableReceiverInterface
 {
+    private const MAX_RETRIES = 3;
     private $retryingSafetyCounter = 0;
     private $connection;
     private $serializer;
@@ -50,10 +51,11 @@ public function get(): iterable
             $doctrineEnvelope = $this->connection->get();
             $this->retryingSafetyCounter = 0; // reset counter
         } catch (RetryableException $exception) {
-            // Do nothing when RetryableException occurs less than "redelivery_max_count"
+            // Do nothing when RetryableException occurs less than "MAX_RETRIES"
             // as it will likely be resolved on the next call to get()
             // Problem with concurrent consumers and database deadlocks
-            if (++$this->retryingSafetyCounter >= $this->connection->getConfiguration()['redelivery_max_count']) {
+            if (++$this->retryingSafetyCounter >= self::MAX_RETRIES) {
+                $this->retryingSafetyCounter = 0; // reset counter
                 throw new TransportException($exception->getMessage(), 0, $exception);
             }
 
