diff options
| author | karthik nayak <knayak@gitlab.com> | 2023-09-15 11:47:28 +0300 |
|---|---|---|
| committer | karthik nayak <knayak@gitlab.com> | 2023-09-15 11:47:28 +0300 |
| commit | 16cd7e7fa2bb9afdd7061ae6187f739dc2fe120f (patch) | |
| tree | 9927a5e2b8eb05b93b0ccc7cc870d310fb07b628 | |
| parent | f521e116b2fb4731145b732e8a372f9db99ef986 (diff) | |
| parent | 8bb0db4d2e667308821812d6973170d4d9c6a167 (diff) | |
Merge branch 'wc/disable-auto-maintenance' into 'master'
git: Disable automatic maintenance
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6368
Merged-by: karthik nayak <knayak@gitlab.com>
Approved-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: karthik nayak <knayak@gitlab.com>
Co-authored-by: Will Chandler <wchandler@gitlab.com>
| -rw-r--r-- | internal/git/command_factory.go | 3 | ||||
| -rw-r--r-- | internal/git/command_factory_test.go | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/internal/git/command_factory.go b/internal/git/command_factory.go index bfb472030..c7e6b1036 100644 --- a/internal/git/command_factory.go +++ b/internal/git/command_factory.go @@ -586,6 +586,9 @@ func (cf *ExecCommandFactory) GlobalConfiguration(ctx context.Context) ([]Config // of it ourselves. {Key: "gc.auto", Value: "0"}, + // Disable automatic maintenance as we never enable any tasks. + {Key: "maintenance.auto", Value: "0"}, + // CRLF line endings will get replaced with LF line endings // when writing blobs to the object database. No conversion is // done when reading blobs from the object database. This is diff --git a/internal/git/command_factory_test.go b/internal/git/command_factory_test.go index 48d19bde3..b2cf5601d 100644 --- a/internal/git/command_factory_test.go +++ b/internal/git/command_factory_test.go @@ -606,6 +606,7 @@ func TestExecCommandFactory_config(t *testing.T) { expectedEnv := []string{ "gc.auto=0", + "maintenance.auto=0", "core.autocrlf=input", "core.usereplacerefs=false", "core.fsync=objects,derived-metadata,reference", |