symfony · jderusse · Oct 9, 2020
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1667,6 +1667,7 @@ private function addHttpClientRetrySection()
                         ->defaultValue([423, 425, 429, 500, 502, 503, 504, 507, 510])
                     ->end()
                     ->integerNode('max_retries')->defaultValue(3)->min(0)->end()
+                    ->floatNode('retry_timeout')->defaultNull()->min(0)->info('The idle timeout in seconds before retrying the request, defaults to the "default_socket_timeout" ini parameter.')->end()
                     ->integerNode('delay')->defaultValue(1000)->min(0)->info('Time in ms to delay (or the initial value when multiplier is used)')->end()
                     ->floatNode('multiplier')->defaultValue(2)->min(1)->info('If greater than 1, delay will grow exponentially for each retry: (delay * (multiple ^ retries))')->end()
                     ->integerNode('max_delay')->defaultValue(0)->min(0)->info('Max time in ms that a retry should ever be delayed (0 = infinite)')->end()

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2096,7 +2096,7 @@ private function registerHttpClientRetry(array $retryOptions, string $name, Cont
         $container
             ->register($name.'.retry', RetryableHttpClient::class)
             ->setDecoratedService($name, null, -10) // lower priority than TraceableHttpClient
-            ->setArguments([new Reference($name.'.retry.inner'), $deciderReference, $backoffReference, $retryOptions['max_retries'], new Reference('logger')])
+            ->setArguments([new Reference($name.'.retry.inner'), $deciderReference, $backoffReference, $retryOptions['max_retries'], $retryOptions['retry_timeout'], new Reference('logger')])
             ->addTag('monolog.logger', ['channel' => 'http_client']);
     }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -584,6 +584,7 @@
         <xsd:attribute name="backoff-service" type="xsd:string" />
         <xsd:attribute name="decider-service" type="xsd:string" />
         <xsd:attribute name="max-retries" type="xsd:integer" />
+        <xsd:attribute name="retry-timeout" type="xsd:float" />
         <xsd:attribute name="delay" type="xsd:integer" />
         <xsd:attribute name="multiplier" type="xsd:float" />
         <xsd:attribute name="max-delay" type="xsd:float" />

diff --git a/...mfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_retry.php b/...mfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_retry.php
@@ -8,6 +8,7 @@
                 'decider_service' => null,
                 'http_codes' => [429, 500],
                 'max_retries' => 2,
+                'retry_timeout' => 10,
                 'delay' => 100,
                 'multiplier' => 2,
                 'max_delay' => 0,

diff --git a/...mfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/http_client_retry.xml b/...mfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/http_client_retry.xml
@@ -12,6 +12,7 @@
                         delay="100"
                         max-delay="0"
                         max-retries="2"
+                        retry-timeout="10"
                         multiplier="2"
                         jitter="0.3">
                     <framework:http-code>429</framework:http-code>

diff --git a/...mfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/http_client_retry.yml b/...mfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/http_client_retry.yml
@@ -6,6 +6,7 @@ framework:
                 decider_service: null
                 http_codes: [429, 500]
                 max_retries: 2
+                retry_timeout: 10
                 delay: 100
                 multiplier: 2
                 max_delay: 0

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1506,6 +1506,7 @@ public function testHttpClientRetry()
         $this->assertSame(0, $container->getDefinition('http_client.retry.exponential_backoff')->getArgument(2));
         $this->assertSame(0.3, $container->getDefinition('http_client.retry.exponential_backoff')->getArgument(3));
         $this->assertSame(2, $container->getDefinition('http_client.retry')->getArgument(3));
+        $this->assertSame(10, $container->getDefinition('http_client.retry')->getArgument(4));
 
         $this->assertSame(RetryableHttpClient::class, $container->getDefinition('foo.retry')->getClass());
         $this->assertSame(4, $container->getDefinition('foo.retry.exponential_backoff')->getArgument(1));

diff --git a/src/Symfony/Component/HttpClient/RetryableHttpClient.php b/src/Symfony/Component/HttpClient/RetryableHttpClient.php
@@ -36,18 +36,21 @@ class RetryableHttpClient implements HttpClientInterface
     private $decider;
     private $strategy;
     private $maxRetries;
+    private $retryTimeout;
     private $logger;
 
     /**
-     * @param int $maxRetries The maximum number of times to retry
+     * @param int $maxRetries   The maximum number of times to retry
+     * @param int $retryTimeout The idle timeout in seconds before retrying the request, defaults to the "default_socket_timeout" ini parameter.
      */
-    public function __construct(HttpClientInterface $client, RetryDeciderInterface $decider = null, RetryBackOffInterface $strategy = null, int $maxRetries = 3, LoggerInterface $logger = null)
+    public function __construct(HttpClientInterface $client, RetryDeciderInterface $decider = null, RetryBackOffInterface $strategy = null, int $maxRetries = 3, float $retryTimeout = null, LoggerInterface $logger = null)
     {
         $this->client = $client;
         $this->decider = $decider ?? new HttpStatusCodeDecider();
         $this->strategy = $strategy ?? new ExponentialBackOff();
         $this->maxRetries = $maxRetries;
         $this->logger = $logger ?: new NullLogger();
+        $this->retryTimeout = $retryTimeout ?? (float) ini_get('default_socket_timeout');
     }
 
     public function request(string $method, string $url, array $options = []): ResponseInterface
@@ -59,11 +62,18 @@ public function request(string $method, string $url, array $options = []): Respo
         $retryCount = 0;
         $content = '';
         $firstChunk = null;
+        $lastChunk = \microtime(true);
 
-        return new AsyncResponse($this->client, $method, $url, $options, function (ChunkInterface $chunk, AsyncContext $context) use ($method, $url, $options, &$retryCount, &$content, &$firstChunk) {
+        return new AsyncResponse($this->client, $method, $url, $options + ['timeout' => $this->retryTimeout], function (ChunkInterface $chunk, AsyncContext $context) use (&$lastChunk, $method, $url, $options, &$retryCount, &$content, &$firstChunk) {
             $exception = null;
             try {
-                if ($chunk->isTimeout() || null !== $chunk->getInformationalStatus()) {
+                if ($chunk->isTimeout() && \microtime(true) - $lastChunk <= $this->retryTimeout) {
+                    yield $chunk;
+
+                    return;
+                }
+                $lastChunk = \microtime(true);
+                if (null !== $chunk->getInformationalStatus()) {
                     yield $chunk;
 
                     return;
@@ -124,11 +134,16 @@ public function request(string $method, string $url, array $options = []): Respo
                 'delay' => $delay,
             ]);
 
-            $context->replaceRequest($method, $url, $options);
-            $context->pause($delay / 1000);
-
+            // it's expected to no having chunk in the next $delay seconds
+            $lastChunk = \microtime(true) + $delay / 1000;
             if ($retryCount >= $this->maxRetries) {
+                $context->replaceRequest($method, $url, $options);
+                $context->pause($delay / 1000);
+
                 $context->passthru();
+            } else {
+                $context->replaceRequest($method, $url, $options + ['timeout' => $this->retryTimeout + $delay / 1000]);
+                $context->pause($delay / 1000);
             }
         });
     }