diff options
| author | John Cai <jcai@gitlab.com> | 2022-03-24 17:29:29 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2022-03-24 17:29:29 +0300 |
| commit | 0bd7062fa94943aed8fb05fc1bcb7c37a57a45c6 (patch) | |
| tree | 09cb81d98db1742929ef812aebf47393259464e6 | |
| parent | e302aa4a8caf07caad38c236d610fea49a41aa2f (diff) | |
| parent | 57d2cc329bf5a5efe9d80f748ae102545c7ba2ff (diff) | |
Merge branch 'fix-cgroups-stats-collection' into 'master'
cgroups: Allow stats to be collected in absence of memsw.* entries
See merge request gitlab-org/gitaly!4431
| -rw-r--r-- | internal/cgroups/v1_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/cgroups/v1_linux.go b/internal/cgroups/v1_linux.go index e524d7609..d98a75807 100644 --- a/internal/cgroups/v1_linux.go +++ b/internal/cgroups/v1_linux.go @@ -181,7 +181,7 @@ func (cg *CGroupV1Manager) currentProcessCgroup() string { func defaultSubsystems(root string) ([]cgroups.Subsystem, error) { subsystems := []cgroups.Subsystem{ - cgroups.NewMemory(root), + cgroups.NewMemory(root, cgroups.OptionalSwap()), cgroups.NewCpu(root), } |