agent: wait session to be fully shutdown

So that we don't have any other goroutine on the channel before retrying. Signed-off-by: Peng Tao <[email protected]>
kata-containers · Aug 29, 2018 · 0865c98 · 0865c98
1 parent 55f1480
commit 0865c98
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/channel.go b/channel.go
@@ -103,6 +103,7 @@ func (c *vSockChannel) teardown() error {
 type serialChannel struct {
 	serialPath string
 	serialConn *os.File
+	waitCh     <-chan struct{}
 }
 
 func (c *serialChannel) setup() error {
@@ -200,11 +201,16 @@ func (c *serialChannel) listen() (net.Listener, error) {
 	if err != nil {
 		return nil, err
 	}
+	c.waitCh = session.CloseChan()
 
 	return session, nil
 }
 
 func (c *serialChannel) teardown() error {
+	// wait for the session to be fully shutdown first
+	if c.waitCh != nil {
+		<-c.waitCh
+	}
 	return c.serialConn.Close()
 }
 

diff --git a/channel_test.go b/channel_test.go
@@ -49,13 +49,20 @@ func TestWaitSerialChannel(t *testing.T) {
 }
 
 func TestListenSerialChannel(t *testing.T) {
-	_, f, err := os.Pipe()
+	f, _, err := os.Pipe()
 	assert.Nil(t, err, "%v", err)
 
 	c := &serialChannel{serialConn: f}
 
-	_, err = c.listen()
+	l, err := c.listen()
+	assert.Nil(t, err, "%v", err)
+	assert.NotNil(t, l, "listen should not return nil listener")
+
+	err = l.Close()
 	assert.Nil(t, err, "%v", err)
+
+	err = c.teardown()
+	assert.Error(t, err, "connection should be already closed")
 }
 
 func TestTeardownSerialChannel(t *testing.T) {