diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-09 14:08:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 14:08:48 -0400 |
| commit | 68dace0619b86196c38945d0918181272656a254 (patch) | |
| tree | a71959eb447e35b066e4def95ae7e62476322060 | |
| parent | 9c4c883d7976a3bd72aef9b9bb8e8757959f4fe4 (diff) | |
| parent | 7b69b99db7c1b762495db60aab0fc5bce8c20796 (diff) | |
| download | podman-68dace0619b86196c38945d0918181272656a254.tar.gz podman-68dace0619b86196c38945d0918181272656a254.tar.bz2 podman-68dace0619b86196c38945d0918181272656a254.zip | |
Merge pull request #7573 from rhatdan/oom
Make oom-score-adj actually work
| -rw-r--r-- | pkg/specgen/generate/oci.go | 3 | ||||
| -rw-r--r-- | test/e2e/run_test.go | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index fd324c6e1..b57ddf1aa 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -353,6 +353,9 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt configSpec.Annotations[define.InspectAnnotationInit] = define.InspectResponseFalse } + if s.OOMScoreAdj != nil { + g.SetProcessOOMScoreAdj(*s.OOMScoreAdj) + } setProcOpts(s, &g) return configSpec, nil diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 1ac753201..a67f7df92 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -325,10 +325,10 @@ USER bin` Expect(session.ExitCode()).To(Equal(0)) } - session = podmanTest.Podman([]string{"run", "--rm", "--oom-score-adj=100", fedoraMinimal, "cat", "/proc/self/oom_score_adj"}) + session = podmanTest.Podman([]string{"run", "--rm", "--oom-score-adj=111", fedoraMinimal, "cat", "/proc/self/oom_score_adj"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - Expect(session.OutputToString()).To(ContainSubstring("100")) + Expect(session.OutputToString()).To(Equal("111")) }) It("podman run limits host test", func() { |