summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-08-22 16:44:39 +0000
committerJarka Kadlecova <jarka@gitlab.com>2017-08-22 20:19:12 +0200
commit54830c8502a1418d7ecdf36184a469ecaeef63b6 (patch)
tree4ad8a01238ebf13085b18267c0feb67d01e699e0
parent8171e1f61b45256eed3eddc4d615c14d78c6d315 (diff)
downloadgitlab-ce-54830c8502a1418d7ecdf36184a469ecaeef63b6.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.rb3
-rw-r--r--changelogs/unreleased/13719-git-gc-timeout.yml3
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