sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(objectstore): add configurable S3 retry attempts 

Add retriesMaxAttempts parameter to S3 objectstore configuration
to allow customization of AWS SDK retry behavior for handling
unreliable network conditions or proxy issues.

Defaults to 5 retries (AWS SDK default) if not specified.

Signed-off-by: nfebe <fenn25.fn@gmail.com>
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
pull/56541/head
nfebe 2025-11-18 00:18:57 +07:00 committed by Daniel Kesselberg
parent e84960cd91
commit 3e2582c4e6
No known key found for this signature in database
GPG Key ID: 4A81C29F63464E8F
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/config.sample.php
Unescape Escape View File

@ -1902,6 +1902,25 @@ $CONFIG = [
],
],
/**
* To use S3 object storage
*/
'objectstore' => [
'class' => 'OC\\Files\\ObjectStore\\S3',
'arguments' => [
'bucket' => 'nextcloud',
'key' => 'your-access-key',
'secret' => 'your-secret-key',
'hostname' => 's3.example.com',
'port' => 443,
'use_ssl' => true,
'region' => 'us-east-1',
// optional: Maximum number of retry attempts for failed S3 requests
// Default: 5
'retriesMaxAttempts' => 5,
],
],
/**
* If this is set to true and a multibucket object store is configured, then
* newly created previews are put into 256 dedicated buckets.

2
lib/private/Files/ObjectStore/S3ConfigTrait.php
Unescape Escape View File

@ -38,4 +38,6 @@ trait S3ConfigTrait {
private int|float $copySizeLimit;
private bool $useMultipartCopy = true;
protected int $retriesMaxAttempts;
}

3
lib/private/Files/ObjectStore/S3ConnectionTrait.php
Unescape Escape View File

@ -53,6 +53,7 @@ trait S3ConnectionTrait {
$this->putSizeLimit = $params['putSizeLimit'] ?? 104857600;
$this->copySizeLimit = $params['copySizeLimit'] ?? 5242880000;
$this->useMultipartCopy = (bool)($params['useMultipartCopy'] ?? true);
$this->retriesMaxAttempts = $params['retriesMaxAttempts'] ?? 5;
$params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
$params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname'];
$params['s3-accelerate'] = $params['hostname'] === 's3-accelerate.amazonaws.com' || $params['hostname'] === 's3-accelerate.dualstack.amazonaws.com';
@ -115,7 +116,7 @@ trait S3ConnectionTrait {
'use_aws_shared_config_files' => false,
'retries' => [
'mode' => 'standard',
'max_attempts' => 5,
'max_attempts' => $this->retriesMaxAttempts,
],
];