libcontainer/cgroups/fs2: Manager.GetStats() sort by kernel version

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
opencontainers · Oct 8, 2022 · 6ac9819 · 6ac9819
1 parent 70e1fc5
commit 6ac9819
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/libcontainer/cgroups/fs2/fs2.go b/libcontainer/cgroups/fs2/fs2.go
@@ -109,6 +109,10 @@ func (m *manager) GetStats() (*cgroups.Stats, error) {
 	if err := statIo(m.dirPath, st); err != nil && !os.IsNotExist(err) {
 		errs = append(errs, err)
 	}
+	// rdma (since kernel 4.11)
+	if err := fscommon.RdmaGetStats(m.dirPath, st); err != nil && !os.IsNotExist(err) {
+		errs = append(errs, err)
+	}
 	// cpu (since kernel 4.15)
 	// Note cpu.stat is available even if the controller is not enabled.
 	if err := statCpu(m.dirPath, st); err != nil && !os.IsNotExist(err) {
@@ -128,10 +132,6 @@ func (m *manager) GetStats() (*cgroups.Stats, error) {
 	if err := statHugeTlb(m.dirPath, st); err != nil && !os.IsNotExist(err) {
 		errs = append(errs, err)
 	}
-	// rdma (since kernel 4.11)
-	if err := fscommon.RdmaGetStats(m.dirPath, st); err != nil && !os.IsNotExist(err) {
-		errs = append(errs, err)
-	}
 	if len(errs) > 0 && !m.config.Rootless {
 		return st, fmt.Errorf("error while statting cgroup v2: %+v", errs)
 	}