Skip to content

Commit 9196892

Browse files
dmcgowandmcgowan
authored
Merge pull request #3250 from thaJeztah/1.2_backport_bump_ttrpc
[release/1.2 backport] Update ttrpc
2 parents 502ed64 + 79f6941 commit 9196892

9 files changed

Lines changed: 54 additions & 18 deletions

File tree

‎runtime/v1/shim/client/client.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,7 @@ func WithConnect(address string, onClose func()) Opt {
172172
if err != nil {
173173
return nil, nil, err
174174
}
175-
client := ttrpc.NewClient(conn)
176-
client.OnClose(onClose)
175+
client := ttrpc.NewClient(conn, ttrpc.WithOnClose(onClose))
177176
return shimapi.NewShimClient(client), conn, nil
178177
}
179178
}

‎runtime/v2/binary.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ func (b *binary) Start(ctx context.Context) (_ *shim, err error) {
9797
if err != nil {
9898
return nil, err
9999
}
100-
client := ttrpc.NewClient(conn)
101-
client.OnClose(func() { conn.Close() })
100+
client := ttrpc.NewClient(conn, ttrpc.WithOnClose(func() { _ = conn.Close() }))
102101
return &shim{
103102
bundle: b.bundle,
104103
client: client,

‎runtime/v2/shim.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ func loadShim(ctx context.Context, bundle *Bundle, events *exchange.Exchange, rt
7575
}
7676
}()
7777

78-
client := ttrpc.NewClient(conn)
79-
client.OnClose(func() { conn.Close() })
78+
client := ttrpc.NewClient(conn, ttrpc.WithOnClose(func() { _ = conn.Close() }))
8079
s := &shim{
8180
client: client,
8281
task: task.NewTaskClient(client),

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ github.com/Microsoft/go-winio v0.4.11
3636
github.com/Microsoft/hcsshim v0.8.1
3737
google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
3838
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
39-
github.com/containerd/ttrpc 2a805f71863501300ae1976d29f0454ae003e85a
39+
github.com/containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636
4040
github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
4141
gotest.tools v2.1.0
4242
github.com/google/go-cmp v0.1.0

‎vendor/github.com/containerd/ttrpc/README.md‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/ttrpc/client.go‎

Lines changed: 20 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/ttrpc/server.go‎

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/ttrpc/services.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/ttrpc/types.go‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)