diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-09-04 14:30:11 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-09-04 14:30:11 +0000 |
commit | d47a00c35706b70b89a39092861bd40e731cf5c9 (patch) | |
tree | 109bdbc2223d5d7f14f91fbb3914af18b9de6569 | |
parent | a0c13698f948d4ebc69ce54660c4022a4a394a0c (diff) | |
parent | d3ca6c0f25f29db220fcc67fe7070358f4543057 (diff) | |
download | gitlab-ce-d47a00c35706b70b89a39092861bd40e731cf5c9.tar.gz |
Merge branch 'bvl-increase-storage-check-timeout' into 'master'
Increase the timeout before aborting a storage access attempt
See merge request !14023
-rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 545c01e1156..c5704ac5857 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -508,7 +508,7 @@ production: &base failure_count_threshold: 10 # number of failures before stopping attempts failure_wait_time: 30 # Seconds after an access failure before allowing access again failure_reset_time: 1800 # Time in seconds to expire failures - storage_timeout: 5 # Time in seconds to wait before aborting a storage access attempt + storage_timeout: 30 # Time in seconds to wait before aborting a storage access attempt ## Backup settings |