Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions linux/shim/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ func NewService(config Config, publisher events.Publisher) (*Service, error) {
type platform interface {
copyConsole(ctx context.Context, console console.Console, stdin, stdout, stderr string, wg, cwg *sync.WaitGroup) (console.Console, error)
shutdownConsole(ctx context.Context, console console.Console) error
close() error
}

type Service struct {
Expand Down Expand Up @@ -146,6 +147,7 @@ func (s *Service) Delete(ctx context.Context, r *google_protobuf.Empty) (*shimap
return nil, err
}
s.deleteProcess(p.ID())
s.platform.close()
s.events <- &eventsapi.TaskDelete{
ContainerID: s.id,
ExitStatus: uint32(p.ExitStatus()),
Expand Down
4 changes: 4 additions & 0 deletions linux/shim/service_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ func (p *linuxPlatform) shutdownConsole(ctx context.Context, cons console.Consol
return epollConsole.Shutdown(p.epoller.CloseConsole)
}

func (p *linuxPlatform) close() error {
return p.epoller.Close()
}

// initialize a single epoll fd to manage our consoles. `initPlatform` should
// only be called once.
func (s *Service) initPlatform() error {
Expand Down
4 changes: 4 additions & 0 deletions linux/shim/service_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ func (p *unixPlatform) shutdownConsole(ctx context.Context, cons console.Console
return nil
}

func (p *unixPlatform) close() error {
return nil
}

func (s *Service) initPlatform() error {
s.platform = &unixPlatform{}
return nil
Expand Down
2 changes: 1 addition & 1 deletion vendor.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6
github.com/containerd/go-runc b3c048c028ddd789c6f9510c597f8b9c62f25359
github.com/containerd/console 76d18fd1d66972718ab2284449591db0b3cdb4de
github.com/containerd/console b28c739c79ce69d017e3691ad3664568d68e95c6
github.com/containerd/cgroups 5933ab4dc4f7caa3a73a1dc141bd11f42b5c9163
github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
github.com/docker/go-metrics 8fd5772bf1584597834c6f7961a530f06cbfbb87
Expand Down
21 changes: 0 additions & 21 deletions vendor/github.com/Azure/go-ansiterm/LICENSE

This file was deleted.

12 changes: 0 additions & 12 deletions vendor/github.com/Azure/go-ansiterm/README.md

This file was deleted.

188 changes: 0 additions & 188 deletions vendor/github.com/Azure/go-ansiterm/constants.go

This file was deleted.

7 changes: 0 additions & 7 deletions vendor/github.com/Azure/go-ansiterm/context.go

This file was deleted.

49 changes: 0 additions & 49 deletions vendor/github.com/Azure/go-ansiterm/csi_entry_state.go

This file was deleted.

38 changes: 0 additions & 38 deletions vendor/github.com/Azure/go-ansiterm/csi_param_state.go

This file was deleted.

Loading