]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
lxccontainer: remove 5s timeout 1736/head
authorChristian Brauner <christian.brauner@ubuntu.com>
Tue, 8 Aug 2017 19:48:48 +0000 (21:48 +0200)
committerChristian Brauner <christian.brauner@ubuntu.com>
Thu, 10 Aug 2017 18:30:06 +0000 (20:30 +0200)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/lxccontainer.c

index 3639d6f2800a3e8e69c97fe7c3a267438849c251..44b4068d2073a768edd8e19d094f287bd028e7ed 100644 (file)
@@ -705,18 +705,6 @@ static int lxc_rcv_status(int state_socket)
 {
         int ret;
         int state = -1;
-        struct timeval timeout = {0};
-
-        /* Set 5 second timeout to prevent hanging forever in case something
-         * goes wrong. 5 seconds is a long time to get into RUNNING state.
-         */
-        timeout.tv_sec = 5;
-        ret = setsockopt(state_socket, SOL_SOCKET, SO_RCVTIMEO,
-                         (const void *)&timeout, sizeof(timeout));
-        if (ret < 0) {
-                SYSERROR("Failed to set 5s timeout on containter state socket");
-                return -1;
-        }
 
 again:
         /* Receive container state. */