Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 10, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions daemon/mgr/cri.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"path"
"path/filepath"
"strings"
"time"

apitypes "github.com/alibaba/pouch/apis/types"
"github.com/alibaba/pouch/cri/stream"
Expand Down Expand Up @@ -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
Expand Down
15 changes: 12 additions & 3 deletions daemon/mgr/cri_stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"net"
"os/exec"
"strings"
"time"

apitypes "github.com/alibaba/pouch/apis/types"
"github.com/alibaba/pouch/cri/stream"
Expand Down Expand Up @@ -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
Expand Down