Skip to content

Commit

Permalink
Update ttrpc vendor to forked version to fix deadlock
Browse files Browse the repository at this point in the history
This pulls in a new version of github.com/containerd/ttrpc from a fork
to fix the deadlock issue in containerd/ttrpc#72. Will revert back to
the upstream ttrpc vendor once the fix is merged (containerd/ttrpc#73).

This fix also included some vendoring cleanup from running "vndr".

Signed-off-by: Kevin Parsons <[email protected]>
  • Loading branch information
kevpar committed Dec 7, 2020
1 parent 93e0504 commit 16caa11
Show file tree
Hide file tree
Showing 16 changed files with 140 additions and 503 deletions.
2 changes: 1 addition & 1 deletion vendor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ github.com/containerd/continuity bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
github.com/containerd/go-cni 40bcf8ec8acd7372be1d77031d585d5d8e561c90
github.com/containerd/go-runc 5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266a007bf03670f
github.com/containerd/ttrpc a43d9fd2cb85a767787a707cfbdd7fe798316b61 https://github.com/kevpar/ttrpc.git # deadlock
github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
github.com/containernetworking/cni v0.6.0
github.com/containernetworking/plugins v0.7.0
Expand Down
91 changes: 67 additions & 24 deletions vendor/github.com/containerd/ttrpc/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions vendor/github.com/containerd/ttrpc/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 49 additions & 9 deletions vendor/github.com/containerd/ttrpc/server.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions vendor/github.com/containerd/ttrpc/services.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/github.com/docker/docker/pkg/signal/README.md

This file was deleted.

54 changes: 0 additions & 54 deletions vendor/github.com/docker/docker/pkg/signal/signal.go

This file was deleted.

41 changes: 0 additions & 41 deletions vendor/github.com/docker/docker/pkg/signal/signal_darwin.go

This file was deleted.

Loading

0 comments on commit 16caa11

Please sign in to comment.