Merge pull request #1086 from YaoZengzeng/exec-fix

bugfix: loop execInspect to get result for cri manager's exec method

daemon/mgr/cri.go

@@ -7,6 +7,7 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
+	"time"
 
 	apitypes "github.com/alibaba/pouch/apis/types"
 	"github.com/alibaba/pouch/cri/stream"
@@ -686,9 +687,17 @@ func (c *CriManager) ExecSync(ctx context.Context, r *runtime.ExecSyncRequest) (
 		return nil, fmt.Errorf("failed to start exec for container %q: %v", id, err)
 	}
 
-	execConfig, err := c.ContainerMgr.GetExecConfig(ctx, execid)
-	if err != nil {
-		return nil, fmt.Errorf("failed to inspect exec for container %q: %v", id, err)
+	var execConfig *ContainerExecConfig
+	for {
+		execConfig, err = c.ContainerMgr.GetExecConfig(ctx, execid)
+		if err != nil {
+			return nil, fmt.Errorf("failed to inspect exec for container %q: %v", id, err)
+		}
+		// Loop until exec finished.
+		if !execConfig.Running {
+			break
+		}
+		time.Sleep(100 * time.Millisecond)
 	}
 
 	var stderr []byte

daemon/mgr/cri_stream.go

@@ -8,6 +8,7 @@ import (
 	"net"
 	"os/exec"
 	"strings"
+	"time"
 
 	apitypes "github.com/alibaba/pouch/apis/types"
 	"github.com/alibaba/pouch/cri/stream"
@@ -58,9 +59,17 @@ func (s *streamRuntime) Exec(containerID string, cmd []string, streamOpts *remot
 		return 0, fmt.Errorf("failed to start exec for container %q: %v", containerID, err)
 	}
 
-	ei, err := s.containerMgr.InspectExec(ctx, execid)
-	if err != nil {
-		return 0, fmt.Errorf("failed to inspect exec for container %q: %v", containerID, err)
+	var ei *apitypes.ContainerExecInspect
+	for {
+		ei, err = s.containerMgr.InspectExec(ctx, execid)
+		if err != nil {
+			return 0, fmt.Errorf("failed to inspect exec for container %q: %v", containerID, err)
+		}
+		// Loop until exec finished.
+		if !ei.Running {
+			break
+		}
+		time.Sleep(100 * time.Millisecond)
 	}
 
 	return uint32(ei.ExitCode), nil