Skip to content

L
lxc
Unverified Commit 2341916a by Rachid Koucha Committed by GitHub
Options

Avoid double lxc-freeze/unfreeze

If we call lxc-freeze multiple times for an already frozen container, LXC triggers useless freezing by writing into the "freezer.state" cgroup file. This is the same when we call lxc-unfreeze multiple times. Checking the current state with a LXC_CMD_GET_STATE (calling c->state) would permit to check if the container is FROZEN or not. Signed-off-by: 's avatarRachid Koucha <rachid.koucha@gmail.com>
parent 5283a118
Showing with 8 additions and 0 deletions
src/lxc/lxccontainer.c
...@@ -525,13 +525,17 @@ WRAP_API(bool, lxcapi_is_running) ...@@ -525,13 +525,17 @@ WRAP_API(bool, lxcapi_is_running)
static bool do_lxcapi_freeze(struct lxc_container *c) static bool do_lxcapi_freeze(struct lxc_container *c)
{ {
int ret; int ret;
lxc_state_t s;
if (!c) if (!c)
return false; return false;
s = lxc_getstate(c->name, c->config_path);
if (s != FROZEN) {
ret = lxc_freeze(c->lxc_conf, c->name, c->config_path); ret = lxc_freeze(c->lxc_conf, c->name, c->config_path);
if (ret < 0) if (ret < 0)
return false; return false;
}
return true; return true;
} }
...@@ -541,13 +545,17 @@ WRAP_API(bool, lxcapi_freeze) ...@@ -541,13 +545,17 @@ WRAP_API(bool, lxcapi_freeze)
static bool do_lxcapi_unfreeze(struct lxc_container *c) static bool do_lxcapi_unfreeze(struct lxc_container *c)
{ {
int ret; int ret;
lxc_state_t s;
if (!c) if (!c)
return false; return false;
s = lxc_getstate(c->name, c->config_path);
if (s == FROZEN) {
ret = lxc_unfreeze(c->lxc_conf, c->name, c->config_path); ret = lxc_unfreeze(c->lxc_conf, c->name, c->config_path);
if (ret < 0) if (ret < 0)
return false; return false;
}
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment