cb0140063e
The resize chan is never closed when doing exec/attach now. What's more, `resize` is a recieved only chan so it can not be closed. Use ctx to exit the goroutine in `handleResizing` properly. Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
85 lines
2.7 KiB
Go
85 lines
2.7 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package server
|
|
|
|
import (
|
|
"io"
|
|
|
|
"github.com/containerd/containerd"
|
|
"github.com/containerd/containerd/log"
|
|
"github.com/pkg/errors"
|
|
"golang.org/x/net/context"
|
|
"k8s.io/client-go/tools/remotecommand"
|
|
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
|
|
|
|
cio "github.com/containerd/cri/pkg/server/io"
|
|
)
|
|
|
|
// Attach prepares a streaming endpoint to attach to a running container, and returns the address.
|
|
func (c *criService) Attach(ctx context.Context, r *runtime.AttachRequest) (*runtime.AttachResponse, error) {
|
|
cntr, err := c.containerStore.Get(r.GetContainerId())
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "failed to find container in store")
|
|
}
|
|
state := cntr.Status.Get().State()
|
|
if state != runtime.ContainerState_CONTAINER_RUNNING {
|
|
return nil, errors.Errorf("container is in %s state", criContainerStateToString(state))
|
|
}
|
|
return c.streamServer.GetAttach(r)
|
|
}
|
|
|
|
func (c *criService) attachContainer(ctx context.Context, id string, stdin io.Reader, stdout, stderr io.WriteCloser,
|
|
tty bool, resize <-chan remotecommand.TerminalSize) error {
|
|
ctx, cancel := context.WithCancel(ctx)
|
|
defer cancel()
|
|
// Get container from our container store.
|
|
cntr, err := c.containerStore.Get(id)
|
|
if err != nil {
|
|
return errors.Wrapf(err, "failed to find container %q in store", id)
|
|
}
|
|
id = cntr.ID
|
|
|
|
state := cntr.Status.Get().State()
|
|
if state != runtime.ContainerState_CONTAINER_RUNNING {
|
|
return errors.Errorf("container is in %s state", criContainerStateToString(state))
|
|
}
|
|
|
|
task, err := cntr.Container.Task(ctx, nil)
|
|
if err != nil {
|
|
return errors.Wrap(err, "failed to load task")
|
|
}
|
|
handleResizing(ctx, resize, func(size remotecommand.TerminalSize) {
|
|
if err := task.Resize(ctx, uint32(size.Width), uint32(size.Height)); err != nil {
|
|
log.G(ctx).WithError(err).Errorf("Failed to resize task %q console", id)
|
|
}
|
|
})
|
|
|
|
opts := cio.AttachOptions{
|
|
Stdin: stdin,
|
|
Stdout: stdout,
|
|
Stderr: stderr,
|
|
Tty: tty,
|
|
StdinOnce: cntr.Config.StdinOnce,
|
|
CloseStdin: func() error {
|
|
return task.CloseIO(ctx, containerd.WithStdinCloser)
|
|
},
|
|
}
|
|
// TODO(random-liu): Figure out whether we need to support historical output.
|
|
cntr.IO.Attach(opts)
|
|
return nil
|
|
}
|