diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-22 16:44:39 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-22 16:44:39 +0000 |
| commit | 7965f4e7c3826093a74d4909233dc7fb9c0aac97 (patch) | |
| tree | 34e3129746f82269c48fb356d341e3c8c5b1b4e9 | |
| parent | 080a359e0cad3f2a08fc0050aef4ef038bd645dc (diff) | |
| parent | be28f9520e466114a7fb274fa951492ffe24addc (diff) | |
| download | gitlab-ce-7965f4e7c3826093a74d4909233dc7fb9c0aac97.tar.gz | |
Merge branch 'git-gc-raise-lease-timeotu' into 'master'
Raise Git GC (Housekeeping) Lease Timeout to 24h
See merge request !13719
| -rw-r--r-- | app/services/projects/housekeeping_service.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/13719-git-gc-timeout.yml | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/services/projects/housekeeping_service.rb b/app/services/projects/housekeeping_service.rb index 4b8946f8ee2..d66ef676088 100644 --- a/app/services/projects/housekeeping_service.rb +++ b/app/services/projects/housekeeping_service.rb @@ -9,7 +9,8 @@ module Projects class HousekeepingService < BaseService include Gitlab::CurrentSettings - LEASE_TIMEOUT = 3600 + # Timeout set to 24h + LEASE_TIMEOUT = 86400 class LeaseTaken < StandardError def to_s diff --git a/changelogs/unreleased/13719-git-gc-timeout.yml b/changelogs/unreleased/13719-git-gc-timeout.yml new file mode 100644 index 00000000000..13cf97ec764 --- /dev/null +++ b/changelogs/unreleased/13719-git-gc-timeout.yml @@ -0,0 +1,3 @@ +--- +title: "Raise Housekeeping timeout to 24 hours" +merge_request: 13719 |