add retry using idempontentOps list

googleapis · Dec 9, 2024 · cf9fd55 · cf9fd55
1 parent 69eaeb1
commit cf9fd55
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/Storage/src/Connection/RetryTrait.php b/Storage/src/Connection/RetryTrait.php
@@ -69,6 +69,7 @@ trait RetryTrait
         'objects.get',
         'objects.list',
         'serviceaccount.get',
+        'signBlob.execute'
     ];
 
     /**

diff --git a/Storage/src/SigningHelper.php b/Storage/src/SigningHelper.php
@@ -25,8 +25,6 @@
 use Google\Cloud\Storage\Connection\ConnectionInterface;
 use Google\Cloud\Core\Exception\ServiceException;
 use Google\Cloud\Storage\Connection\RetryTrait;
-use Google\Cloud\Storage\StorageClient;
-use Ramsey\Uuid\Uuid;
 
 /**
  * Provides common methods for signing storage URLs.
@@ -909,21 +907,10 @@ private function buildQueryString(array $input)
      */
     private function retrySignBlob(callable $signBlobFn, string $resourceName = 'signBlob', array $args = [])
     {
-        $attempts = 0;
-        $maxRetries = 5;
-        $invocationId = Uuid::uuid4()->toString();
-        $args['retryStrategy'] = StorageClient::RETRY_ALWAYS;
-
         // Generate a retry decider function using the RetryTrait logic.
         $retryDecider = $this->getRestRetryFunction($resourceName, 'execute', $args);
-
-        while ($attempts < $maxRetries) {
-            $attempts++;
+        while (true) {
             try {
-                // Attach retry headers
-                $headers = self::getRetryHeaders($invocationId, $attempts);
-                $args['headers'] = array_merge($args['headers'] ?? [], $headers);
-
                 // Attempt the operation
                 return $signBlobFn();
             } catch (\Exception $exception) {

diff --git a/Storage/tests/Unit/SigningHelperTest.php b/Storage/tests/Unit/SigningHelperTest.php
@@ -806,10 +806,9 @@ public function testRetrySignBlobSuccessFirstAttempt()
 
     public function testRetrySignBlobSuccessAfterRetries()
     {
-        $attempts = 0;
-        $signBlobFn = function () use (&$attempts) {
-            $attempts++;
-            if ($attempts < 5) {
+        $attempt = 0;
+        $signBlobFn = function () use (&$attempt) {
+            if (++$attempt < 3) {
                 throw new ServiceException('Transient error', 503);
             }
             return 'signature';
@@ -820,7 +819,6 @@ public function testRetrySignBlobSuccessAfterRetries()
         ]);
 
         $this->assertEquals('signature', $res);
-        $this->assertEquals(5, $attempts);
     }
 
     public function testRetrySignBlobNonRetryableError()