bug #50655 Revert "Respect isRetryable decision of the retry strategy for re-delivery" (bendavies)

fabpot · fabpot · commit 4beb102af50d · 2023-06-21T07:17:19.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- Revert "Respect isRetryable decision of the retry strategy for re-delivery" | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Reverts #49063 | License | MIT | Doc PR | Revert "[Messenger] Respect `isRetryable` decision of the retry strategy when deciding if failed message should be re-delivered" This reverts #49063 The linked PR rendered `RecoverableExceptionInterface` useless - i.e. it would not retry indefinately as stated in the docs. See the [discussion on the original PR](#49063 (comment)) Commits ------- dd328a2 Revert "[Messenger] Respect `isRetryable` decision of the retry strategy when deciding if failed message should be re-delivered"
diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
@@ -123,8 +123,7 @@ public static function getSubscribedEvents()
 
     private function shouldRetry(\Throwable $e, Envelope $envelope, RetryStrategyInterface $retryStrategy): bool
     {
-        $isRetryable = $retryStrategy->isRetryable($envelope, $e);
-        if ($isRetryable && $e instanceof RecoverableExceptionInterface) {
+        if ($e instanceof RecoverableExceptionInterface) {
             return true;
         }
 
@@ -133,7 +132,7 @@ private function shouldRetry(\Throwable $e, Envelope $envelope, RetryStrategyInt
         if ($e instanceof HandlerFailedException) {
             $shouldNotRetry = true;
             foreach ($e->getNestedExceptions() as $nestedException) {
-                if ($isRetryable && $nestedException instanceof RecoverableExceptionInterface) {
+                if ($nestedException instanceof RecoverableExceptionInterface) {
                     return true;
                 }
 
@@ -151,7 +150,7 @@ private function shouldRetry(\Throwable $e, Envelope $envelope, RetryStrategyInt
             return false;
         }
 
-        return $isRetryable;
+        return $retryStrategy->isRetryable($envelope, $e);
     }
 
     private function getRetryStrategyForTransport(string $alias): ?RetryStrategyInterface
diff --git a/src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageForRetryListenerTest.php b/src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageForRetryListenerTest.php
@@ -63,7 +63,7 @@ public function testRecoverableStrategyCausesRetry()
         $senderLocator->expects($this->once())->method('has')->willReturn(true);
         $senderLocator->expects($this->once())->method('get')->willReturn($sender);
         $retryStategy = $this->createMock(RetryStrategyInterface::class);
-        $retryStategy->expects($this->once())->method('isRetryable')->willReturn(true);
+        $retryStategy->expects($this->never())->method('isRetryable');
         $retryStategy->expects($this->once())->method('getWaitingTime')->willReturn(1000);
         $retryStrategyLocator = $this->createMock(ContainerInterface::class);
         $retryStrategyLocator->expects($this->once())->method('has')->willReturn(true);
@@ -78,27 +78,6 @@ public function testRecoverableStrategyCausesRetry()
         $listener->onMessageFailed($event);
     }
 
-    public function testRetryIsOnlyAllowedWhenPermittedByRetryStrategy()
-    {
-        $senderLocator = $this->createMock(ContainerInterface::class);
-        $senderLocator->expects($this->never())->method('has');
-        $senderLocator->expects($this->never())->method('get');
-        $retryStrategy = $this->createMock(RetryStrategyInterface::class);
-        $retryStrategy->expects($this->once())->method('isRetryable')->willReturn(false);
-        $retryStrategy->expects($this->never())->method('getWaitingTime');
-        $retryStrategyLocator = $this->createMock(ContainerInterface::class);
-        $retryStrategyLocator->expects($this->once())->method('has')->willReturn(true);
-        $retryStrategyLocator->expects($this->once())->method('get')->willReturn($retryStrategy);
-
-        $listener = new SendFailedMessageForRetryListener($senderLocator, $retryStrategyLocator);
-
-        $exception = new RecoverableMessageHandlingException('retry');
-        $envelope = new Envelope(new \stdClass());
-        $event = new WorkerMessageFailedEvent($envelope, 'my_receiver', $exception);
-
-        $listener->onMessageFailed($event);
-    }
-
     public function testEnvelopeIsSentToTransportOnRetry()
     {
         $exception = new \Exception('no!');

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,7 @@ public static function getSubscribedEvents()`
`123`	`123`
`124`	`124`	`private function shouldRetry(\Throwable $e, Envelope $envelope, RetryStrategyInterface $retryStrategy): bool`
`125`	`125`	`{`
`126`		`- $isRetryable = $retryStrategy->isRetryable($envelope, $e);`
`127`		`- if ($isRetryable && $e instanceof RecoverableExceptionInterface) {`
	`126`	`+ if ($e instanceof RecoverableExceptionInterface) {`
`128`	`127`	`return true;`
`129`	`128`	`}`
`130`	`129`
`@@ -133,7 +132,7 @@ private function shouldRetry(\Throwable $e, Envelope $envelope, RetryStrategyInt`
`133`	`132`	`if ($e instanceof HandlerFailedException) {`
`134`	`133`	`$shouldNotRetry = true;`
`135`	`134`	`foreach ($e->getNestedExceptions() as $nestedException) {`
`136`		`- if ($isRetryable && $nestedException instanceof RecoverableExceptionInterface) {`
	`135`	`+ if ($nestedException instanceof RecoverableExceptionInterface) {`
`137`	`136`	`return true;`
`138`	`137`	`}`
`139`	`138`
`@@ -151,7 +150,7 @@ private function shouldRetry(\Throwable $e, Envelope $envelope, RetryStrategyInt`
`151`	`150`	`return false;`
`152`	`151`	`}`
`153`	`152`
`154`		`- return $isRetryable;`
	`153`	`+ return $retryStrategy->isRetryable($envelope, $e);`
`155`	`154`	`}`
`156`	`155`
`157`	`156`	`private function getRetryStrategyForTransport(string $alias): ?RetryStrategyInterface`