Skip to content

[release/0.8] go.mod: Bump ttrpc to 1.1.0#1224

Merged
dcantah merged 1 commit intomicrosoft:release/0.8from
dcantah:update-ttrpc-dep-0.8
Nov 10, 2021
Merged

[release/0.8] go.mod: Bump ttrpc to 1.1.0#1224
dcantah merged 1 commit intomicrosoft:release/0.8from
dcantah:update-ttrpc-dep-0.8

Conversation

@dcantah
Copy link
Copy Markdown
Contributor

@dcantah dcantah commented Nov 9, 2021

This tag contains a fix for a deadlock we'd observed on Windows when multiple
requests were made in parallel. containerd/ttrpc#94

This tag contains a fix for a deadlock we'd observed on Windows when multiple
requests were made in parallel.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
@dcantah dcantah requested a review from a team as a code owner November 9, 2021 22:40
@kevpar
Copy link
Copy Markdown
Member

kevpar commented Nov 9, 2021

Seems like a lot of dep changes. Was this just from running go get github.com/containerd/ttrpc@v1.1.0, go mod tidy, go mod vendor?

@dcantah
Copy link
Copy Markdown
Contributor Author

dcantah commented Nov 9, 2021

@kevpar Agreed.. but yes those were the steps.

@katiewasnothere
Copy link
Copy Markdown

Why wasn't the other PR this long?

@dcantah
Copy link
Copy Markdown
Contributor Author

dcantah commented Nov 9, 2021

hcsshim/vendor/modules.txt

Lines 147 to 177 in d726877

# google.golang.org/protobuf v1.27.1
google.golang.org/protobuf/encoding/prototext
google.golang.org/protobuf/encoding/protowire
google.golang.org/protobuf/internal/descfmt
google.golang.org/protobuf/internal/descopts
google.golang.org/protobuf/internal/detrand
google.golang.org/protobuf/internal/encoding/defval
google.golang.org/protobuf/internal/encoding/messageset
google.golang.org/protobuf/internal/encoding/tag
google.golang.org/protobuf/internal/encoding/text
google.golang.org/protobuf/internal/errors
google.golang.org/protobuf/internal/filedesc
google.golang.org/protobuf/internal/filetype
google.golang.org/protobuf/internal/flags
google.golang.org/protobuf/internal/genid
google.golang.org/protobuf/internal/impl
google.golang.org/protobuf/internal/order
google.golang.org/protobuf/internal/pragma
google.golang.org/protobuf/internal/set
google.golang.org/protobuf/internal/strs
google.golang.org/protobuf/internal/version
google.golang.org/protobuf/proto
google.golang.org/protobuf/reflect/protodesc
google.golang.org/protobuf/reflect/protoreflect
google.golang.org/protobuf/reflect/protoregistry
google.golang.org/protobuf/runtime/protoiface
google.golang.org/protobuf/runtime/protoimpl
google.golang.org/protobuf/types/descriptorpb
google.golang.org/protobuf/types/known/anypb
google.golang.org/protobuf/types/known/durationpb
google.golang.org/protobuf/types/known/timestamppb

Looks like google.golang.org/protobuf wasn't used somehow on release/0.8. They're already there on master https://github.com/microsoft/hcsshim/blob/master/vendor/modules.txt#L218-L248. That's the majority of the new additions.

@katiewasnothere
Copy link
Copy Markdown

@dcantah maybe do a separate PR for that change then so that this PR can stay relatively the same as the one to the main branch?

@dcantah
Copy link
Copy Markdown
Contributor Author

dcantah commented Nov 9, 2021

@katiewasnothere It was added because ctrd (or one of its deps) uses it apparently. So it was removed when we reverted our ctrd dep to 1.4.x for this branch. 07d25d4

Edit: Nvm I have so many tabs open I've got things backwards, the above is incorrect. Still looking into why this is

Edit 2: They were originally vendored from a containerd 1.5 dependency bump in this repo, was just a beta however.
bd140d7#diff-a2db5ec9e55fbed262dafc2908254f355385060a8bcedff1823fc04b150520b0R271 added these and then subsequently removed with this change that reverted our containerd dep to 1.4.x 1d6647b#diff-b318e1e6bbcc59892bb6b4298564b051c6f6d5d848878d14aab856509ff0625cL148.

So there's nothing I can really do to keep this more in line with the PR against master, it's just that master already has things present in /vendor that are used here because the containerd dep is 1.5.x.

@dcantah dcantah merged commit 133feb6 into microsoft:release/0.8 Nov 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants