From c878a17e11518adefd2573a798fa4b682b548028 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Mon, 17 Jun 2024 10:25:38 -0500 Subject: [PATCH 1/2] Add doc for S3_RETRY_LIMIT --- content/en/admin/config.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/content/en/admin/config.md b/content/en/admin/config.md index a4244056b..6d5a3fc57 100644 --- a/content/en/admin/config.md +++ b/content/en/admin/config.md @@ -579,18 +579,25 @@ The bucket must support access control lists (ACLs). For AWS S3, this means sett #### `S3_OVERRIDE_PATH_STYLE` - #### `S3_PROTOCOL` #### `S3_HOSTNAME` #### `S3_ALIAS_HOST` - #### `S3_OPEN_TIMEOUT` #### `S3_READ_TIMEOUT` +#### `S3_RETRY_LIMIT` + +Adjusting this may be needed for some S3 providers, particularly when there are connectivity issues between the Mastodon server and the S3 storage. This may be observed when posts from other instances have missing media. + +Defaults to `0`, not suggested to increase beyond `3` due to database performance concerns. + +**Version history:**\ +4.3.0 - added + #### `S3_FORCE_SINGLE_REQUEST` #### `S3_ENABLE_CHECKSUM_MODE` From 8229ad2ab9db1cfbdb31b997044106bf9c133924 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Mon, 17 Jun 2024 10:34:42 -0500 Subject: [PATCH 2/2] move to object-storage page --- content/en/admin/config.md | 7 ------- content/en/admin/optional/object-storage.md | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/content/en/admin/config.md b/content/en/admin/config.md index 6d5a3fc57..7659156c7 100644 --- a/content/en/admin/config.md +++ b/content/en/admin/config.md @@ -591,13 +591,6 @@ The bucket must support access control lists (ACLs). For AWS S3, this means sett #### `S3_RETRY_LIMIT` -Adjusting this may be needed for some S3 providers, particularly when there are connectivity issues between the Mastodon server and the S3 storage. This may be observed when posts from other instances have missing media. - -Defaults to `0`, not suggested to increase beyond `3` due to database performance concerns. - -**Version history:**\ -4.3.0 - added - #### `S3_FORCE_SINGLE_REQUEST` #### `S3_ENABLE_CHECKSUM_MODE` diff --git a/content/en/admin/optional/object-storage.md b/content/en/admin/optional/object-storage.md index 7fd856e52..ea4a2c3f2 100644 --- a/content/en/admin/optional/object-storage.md +++ b/content/en/admin/optional/object-storage.md @@ -121,6 +121,15 @@ Default: 5 (seconds) The number of seconds before the HTTP handler should timeout while waiting for an HTTP response. +#### `S3_RETRY_LIMIT` + +Adjusting this may be needed for some S3 providers, particularly when there are connectivity issues between the Mastodon server and the S3 storage. This may be observed when posts from other instances have missing media. + +Defaults to `0`, not suggested to increase beyond `3` due to database performance concerns. + +**Version history:**\ +4.3.0 - added + #### `S3_FORCE_SINGLE_REQUEST` Default: false