diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-04 17:42:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-04 17:42:58 +0000 |
| commit | 7114ad8ea2418f8fdc4741c8b7f5b551bcc467a7 (patch) | |
| tree | 589d36c0e93fddcea736dd6cb085a89252c6501a /lib | |
| parent | 0b4b96be1f12bf2a0b9b561daba716e0468a9e61 (diff) | |
| download | gitlab-ce-7114ad8ea2418f8fdc4741c8b7f5b551bcc467a7.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-8-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/object_storage/direct_upload.rb | 2 | ||||
| -rwxr-xr-x | lib/support/init.d/gitlab | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/object_storage/direct_upload.rb b/lib/object_storage/direct_upload.rb index 3a8fa51e198..7f1c30e574d 100644 --- a/lib/object_storage/direct_upload.rb +++ b/lib/object_storage/direct_upload.rb @@ -206,7 +206,7 @@ module ObjectStorage end def requires_multipart_upload? - config.aws? && !has_length && !use_workhorse_s3_client? + config.aws? && !has_length end def upload_id diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index 98cac0b0d1d..4fe7f0cf480 100755 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -138,8 +138,8 @@ wait_for_pids(){ i=$((i+1)) if [ $((i%10)) = 0 ]; then echo -n "." - elif [ $((i)) = 301 ]; then - echo "Waited 30s for the processes to write their pids, something probably went wrong." + elif [ $((i)) = 601 ]; then + echo "Waited 60s for the processes to write their pids, something probably went wrong." exit 1; fi done |