Merge pull request #2802 from Rachid-Koucha/patch-3

Avoid double lxc-freeze/unfreeze

Merge pull request #2802 from Rachid-Koucha/patch-3
f87c3a22 · Christian Brauner · GitHub · 81f22990 · 2341916a · f87c3a22
Unverified Commit f87c3a22 authored Jan 27, 2019 by Christian Brauner Committed by GitHub Jan 27, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 6 deletions

lxccontainer.c src/lxc/lxccontainer.c +14 -6

No files found.
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -525,13 +525,17 @@ WRAP_API(bool, lxcapi_is_running)
 static bool do_lxcapi_freeze(struct lxc_container *c)
 {
 	int ret;
+	lxc_state_t s;
 	if (!c)
 		return false;
-	ret = lxc_freeze(c->lxc_conf, c->name, c->config_path);
+	s = lxc_getstate(c->name, c->config_path);
-	if (ret < 0)
+	if (s != FROZEN) {
-		return false;
+	  ret = lxc_freeze(c->lxc_conf, c->name, c->config_path);
+	  if (ret < 0)
+	    return false;
+	}
 	return true;
 }
@@ -541,13 +545,17 @@ WRAP_API(bool, lxcapi_freeze)
 static bool do_lxcapi_unfreeze(struct lxc_container *c)
 {
 	int ret;
+	lxc_state_t s;
 	if (!c)
 		return false;
-	ret = lxc_unfreeze(c->lxc_conf, c->name, c->config_path);
+	s = lxc_getstate(c->name, c->config_path);
-	if (ret < 0)
+	if (s == FROZEN) {
-		return false;
+	  ret = lxc_unfreeze(c->lxc_conf, c->name, c->config_path);
+	  if (ret < 0)
+	    return false;
+	}
 	return true;
 }