[lxc-devel] [lxd/master] Revert "client: fix goroutine leak in ExecContainer"

stgraber on Github lxc-bot at linuxcontainers.org
Mon Feb 25 09:03:06 UTC 2019


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 517 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190225/98370ab0/attachment.bin>
-------------- next part --------------
From 2f434854ce3e57f31426f74ee00f6cfc2a011519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 25 Feb 2019 10:02:13 +0100
Subject: [PATCH] Revert "client: fix goroutine leak in ExecContainer"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e2379cf367ef76f1b42f5a747c475c18cbdf6cac.

This fix ended up causing issues as outlined in #5519

Reverting until we have a better fix.

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 client/lxd_containers.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/lxd_containers.go b/client/lxd_containers.go
index 9b6efed094..60c6d3c020 100644
--- a/client/lxd_containers.go
+++ b/client/lxd_containers.go
@@ -806,7 +806,6 @@ func (r *ProtocolLXD) ExecContainer(containerName string, exec api.ContainerExec
 
 				if fds["0"] != "" {
 					args.Stdin.Close()
-					<-dones[0]
 				}
 
 				for _, conn := range conns {


More information about the lxc-devel mailing list