|
 |
308897 |
From 72a9e0c3d4f8daca9f7dc389edbc1013d7c0d808 Mon Sep 17 00:00:00 2001
|
|
|
308897 |
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
|
|
|
308897 |
Date: Fri, 8 Apr 2016 17:00:19 +0200
|
|
|
308897 |
Subject: [PATCH] api.c: fix order of memory subsystem parameters generated by
|
|
|
308897 |
cgsnapshot
|
|
|
308897 |
MIME-Version: 1.0
|
|
|
308897 |
Content-Type: text/plain; charset=UTF-8
|
|
|
308897 |
Content-Transfer-Encoding: 8bit
|
|
|
308897 |
|
|
|
308897 |
Order of parameters usually doesn't matter, but that's not the case with
|
|
|
308897 |
memory.limit_in_bytes and memory.memsw.limit_in_bytes. When the latter
|
|
|
308897 |
is first in the list of parameters, the resulting configuration is not
|
|
|
308897 |
loadable with cgconfigparser.
|
|
|
308897 |
|
|
|
308897 |
This happens because when a cgroup is created, both memory.limit_in_bytes
|
|
|
308897 |
and memory.memsw.limit_in_bytes parameters are initialized to highest
|
|
|
308897 |
value possible (RESOURCE_MAX). And because memory.memsw.limit_in_bytes
|
|
|
308897 |
must be always higher or equal to memory.limit_in_bytes, it's impossible
|
|
|
308897 |
to change its value first.
|
|
|
308897 |
|
|
|
308897 |
Make sure that after constructing parameter list of memory subsystem,
|
|
|
308897 |
the mentioned parameters are in correct order.
|
|
|
308897 |
|
|
|
308897 |
Signed-off-by: Nikola Forró <nforro@redhat.com>
|
|
|
308897 |
---
|
|
|
308897 |
src/api.c | 24 ++++++++++++++++++++++++
|
|
|
308897 |
1 file changed, 24 insertions(+)
|
|
|
308897 |
|
|
|
308897 |
diff --git a/src/api.c b/src/api.c
|
|
|
308897 |
index 0bf0615..f5da553 100644
|
|
|
308897 |
--- a/src/api.c
|
|
|
308897 |
+++ b/src/api.c
|
|
|
308897 |
@@ -2651,6 +2651,30 @@ int cgroup_get_cgroup(struct cgroup *cgroup)
|
|
|
308897 |
}
|
|
|
308897 |
}
|
|
|
308897 |
closedir(dir);
|
|
|
308897 |
+
|
|
|
308897 |
+ if (! strcmp(cgc->name, "memory")) {
|
|
|
308897 |
+ /*
|
|
|
308897 |
+ * Make sure that memory.limit_in_bytes is placed before
|
|
|
308897 |
+ * memory.memsw.limit_in_bytes in the list of values
|
|
|
308897 |
+ */
|
|
|
308897 |
+ int memsw_limit = -1;
|
|
|
308897 |
+ int mem_limit = -1;
|
|
|
308897 |
+
|
|
|
308897 |
+ for (j = 0; j < cgc->index; j++) {
|
|
|
308897 |
+ if (! strcmp(cgc->values[j]->name,
|
|
|
308897 |
+ "memory.memsw.limit_in_bytes"))
|
|
|
308897 |
+ memsw_limit = j;
|
|
|
308897 |
+ else if (! strcmp(cgc->values[j]->name,
|
|
|
308897 |
+ "memory.limit_in_bytes"))
|
|
|
308897 |
+ mem_limit = j;
|
|
|
308897 |
+ }
|
|
|
308897 |
+
|
|
|
308897 |
+ if (memsw_limit >= 0 && memsw_limit < mem_limit) {
|
|
|
308897 |
+ struct control_value *val = cgc->values[memsw_limit];
|
|
|
308897 |
+ cgc->values[memsw_limit] = cgc->values[mem_limit];
|
|
|
308897 |
+ cgc->values[mem_limit] = val;
|
|
|
308897 |
+ }
|
|
|
308897 |
+ }
|
|
|
308897 |
}
|
|
|
308897 |
|
|
|
308897 |
/* Check if the group really exists or not */
|
|
|
308897 |
--
|
|
|
308897 |
2.4.11
|
|
|
308897 |
|