Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: retry with delay in s3 adapter #117

Merged
merged 4 commits into from
Nov 6, 2024
Merged

Feat: retry with delay in s3 adapter #117

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7eb4419
retry with delay in s3 adapter
lohanidamodar Nov 6, 2024
fce7a27
use ms
lohanidamodar Nov 6, 2024
baad507
tweak defaults
lohanidamodar Nov 6, 2024
eb932aa
fix delay
lohanidamodar Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion src/Storage/Device/S3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ class S3 extends Device

protected const MAX_PAGE_SIZE = 1000;

protected static int $retryAttempts = 5;

protected static int $retryDelay = 2; // seconds

/**
* @var string
*/
Expand Down Expand Up @@ -242,6 +246,28 @@ public function setHttpVersion(?int $httpVersion): self
return $this;
}

/**
* Set retry attempts
*
* @param int $attempts
* @return void
*/
public static function setRetryAttempts(int $attempts)
{
self::$retryAttempts = $attempts;
}

/**
* Set retry delay in seconds
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's do ms instead

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

*
* @param int $delay
* @return void
*/
public static function setRetryDelay(int $delay): void
{
self::$retryDelay = $delay;
}

/**
* Upload.
*
Expand Down Expand Up @@ -915,11 +941,20 @@ protected function call(string $method, string $uri, string $data = '', array $p

$result = \curl_exec($curl);

$response->code = \curl_getinfo($curl, CURLINFO_HTTP_CODE);

$attempt = 0;
while ($attempt < self::$retryAttempts && $response->code === 503) {
abnegate marked this conversation as resolved.
Show resolved Hide resolved
sleep(self::$retryDelay);
$attempt++;
$result = \curl_exec($curl);
$response->code = \curl_getinfo($curl, CURLINFO_HTTP_CODE);
}

if (! $result) {
throw new Exception(\curl_error($curl));
}

$response->code = \curl_getinfo($curl, CURLINFO_HTTP_CODE);
if ($response->code >= 400) {
throw new Exception($response->body, $response->code);
}
Expand Down
Loading