]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
lxccontainer: remove 5s timeout
authorChristian Brauner <christian.brauner@ubuntu.com>
Tue, 8 Aug 2017 19:48:48 +0000 (21:48 +0200)
committerStéphane Graber <stgraber@ubuntu.com>
Tue, 15 Aug 2017 20:49:12 +0000 (16:49 -0400)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/lxccontainer.c

index 881c5ed62db2ae86c5f660975eae9c8b1a187c45..5e032828a16f548f412c70fa18a55c54bf3a2291 100644 (file)
@@ -702,18 +702,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. */