From: S.Çağlar Onur <caglar@10ur.org>
Date: Tue, 23 Apr 2013 21:24:31 +0000 (-0400)
Subject: Support starting containers concurrently
X-Git-Tag: lxc-1.0.0.alpha1~1^2~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a9362f5745a58a3d63354d76182108ea81ecf05;p=thirdparty%2Flxc.git

Support starting containers concurrently

Trying to start multiple containers concurrently may cause
lxc_monitor_read_timeout to fail as select call could be
interrupted by a signal, handle it.

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/state.c b/src/lxc/state.c
index 313cbb9ce..4ab131a4c 100644
--- a/src/lxc/state.c
+++ b/src/lxc/state.c
@@ -236,8 +236,11 @@ extern int lxc_wait(const char *lxcname, const char *states, int timeout, const
 				goto out_close;
 			curtime = tv.tv_sec;
 		}
-		if (lxc_monitor_read_timeout(fd, &msg, timeout) < 0)
-			goto out_close;
+		if (lxc_monitor_read_timeout(fd, &msg, timeout) < 0) {
+			/* try again if select interrupted by signal */
+			if (errno != EINTR)
+				goto out_close;
+		}
 
 		if (timeout != -1) {
 			retval = gettimeofday(&tv, NULL);