do_lxcap_stop: wait until container is stopped

In the past, lxc-cmd-stop would wait until the command pipe was closed before returning, ensuring that the container monitor had exited. Now that we accept the actual success return value, lxcapi_stop can return success before the monitor has fully exited. So explicitly wait for the container to stop, when lxc-cmd-stop returned success. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

do_lxcap_stop: wait until container is stopped
fef9aa89 · Serge Hallyn · 69f97e3c · fef9aa89
Commit fef9aa89 authored Apr 14, 2015 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

lxccontainer.c src/lxc/lxccontainer.c +4 -1

No files found.
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -852,7 +852,10 @@ static bool do_lxcapi_stop(struct lxc_container *c)

 	ret = lxc_cmd_stop(c->name, c->config_path);

-	return ret == 0;
+	if (ret == 0)
+		return do_lxcapi_wait(c, "STOPPED", 10);
+
+	return false;
 }

 WRAP_API(bool, lxcapi_stop)