vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Support detaching in CRI attach

Browse source 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
This commit is contained in:
Mrunal Patel 2017-06-06 19:43:44 -07:00
parent 6e53568d15
commit d0486e542f
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
server/container_attach.go
View file

@ -11,6 +11,7 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/kubernetes-incubator/cri-o/oci" "github.com/kubernetes-incubator/cri-o/oci"
"github.com/kubernetes-incubator/cri-o/utils"
"golang.org/x/net/context" "golang.org/x/net/context"
pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
@ -74,18 +75,22 @@ func (ss streamService) Attach(containerID string, inputStream io.Reader, output
}() }()
} }
stdinDone := make(chan struct{}) stdinDone := make(chan error)
go func() { go func() {
var err error
if inputStream != nil { if inputStream != nil {
io.Copy(conn, inputStream) _, err = utils.CopyDetachable(conn, inputStream, nil)
} }
close(stdinDone) stdinDone <- err
}() }()
select { select {
case err := <-receiveStdout: case err := <-receiveStdout:
return err return err
case <-stdinDone: case err := <-stdinDone:
if _, ok := err.(utils.DetachError); ok {
return nil
}
if outputStream != nil || errorStream != nil { if outputStream != nil || errorStream != nil {
return <-receiveStdout return <-receiveStdout
} }