From 5c20ea1472dbeeebdb1bcef31a09888890a25b3a Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 14 Jan 2020 11:13:25 +0900 Subject: [PATCH 1/2] fix merging #2177 and #2169 A new method was added to the cgroup interface when #2177 was merged. After #2177 got merged, #2169 was merged without rebase (sorry!) and compilation was failing: libcontainer/cgroups/fs2/fs2.go:208:22: container.Cgroup undefined (type *configs.Config has no field or method Cgroup) Signed-off-by: Akihiro Suda --- libcontainer/cgroups/fs2/fs2.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libcontainer/cgroups/fs2/fs2.go b/libcontainer/cgroups/fs2/fs2.go index 2d32f8210..4bb7091a1 100644 --- a/libcontainer/cgroups/fs2/fs2.go +++ b/libcontainer/cgroups/fs2/fs2.go @@ -205,5 +205,10 @@ func (m *manager) Set(container *configs.Config) error { if len(errs) > 0 && !m.rootless { return errors.Errorf("error while setting cgroup v2: %+v", errs) } + m.config = container.Cgroups return nil } + +func (m *manager) GetCgroups() (*configs.Cgroup, error) { + return m.config, nil +} From 55f8c254beb00f916c115a7034f7eee0cfd657a1 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 7 Jan 2020 19:59:52 +0900 Subject: [PATCH 2/2] temporarily disable CRIU tests Ubuntu kernel is temporarily broken: https://github.com/opencontainers/runc/pull/2198#issuecomment-571124087 Signed-off-by: Akihiro Suda --- libcontainer/integration/checkpoint_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libcontainer/integration/checkpoint_test.go b/libcontainer/integration/checkpoint_test.go index 44c595e17..cdb681051 100644 --- a/libcontainer/integration/checkpoint_test.go +++ b/libcontainer/integration/checkpoint_test.go @@ -42,6 +42,7 @@ func showFile(t *testing.T, fname string) error { } func TestUsernsCheckpoint(t *testing.T) { + t.Skip("Ubuntu kernel is broken to run criu (#2196, #2198)") if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) { t.Skip("userns is unsupported") } @@ -53,6 +54,7 @@ func TestUsernsCheckpoint(t *testing.T) { } func TestCheckpoint(t *testing.T) { + t.Skip("Ubuntu kernel is broken to run criu (#2196, #2198)") testCheckpoint(t, false) }