Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Update Microsoft/go-winio v0.4.14 #314

Merged
merged 2 commits into from
Aug 8, 2019
Merged

[19.03 backport] Update Microsoft/go-winio v0.4.14 #314

merged 2 commits into from
Aug 8, 2019

Conversation

thaJeztah
Copy link
Member

backports of:

@thaJeztah thaJeztah added this to the 19.03.2 milestone Aug 8, 2019
@thaJeztah thaJeztah mentioned this pull request Aug 8, 2019
Merged
@thaJeztah
Copy link
Member Author

@jterry75 @kevpar @ddebroy PTAL

kevpar and others added 2 commits August 8, 2019 17:10
@kevpar @thaJeztah
Revendor go-winio
80376f9 
This is needed to provide fixes for ETW on ARM. The updated ETW package will
no-op on ARM, rather than crashing. Further changes are needed to Go itself to
allow ETW on ARM to work properly.

Signed-off-by: Kevin Parsons <[email protected]>
(cherry picked from commit e1f0f77)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@jterry75 @thaJeztah
Update Microsoft/go-winio v0.4.14
8ba31dc 
Signed-off-by: Justin Terry (VM) <[email protected]>
(cherry picked from commit 35fe16b)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 19.03_backport_revendor_go_winio branch from ecb64c4 to 8ba31dc Compare August 8, 2019 15:11
jterry75
jterry75 approved these changes Aug 8, 2019
View reviewed changes
Copy link

@jterry75 jterry75 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (not a maintainer)

@thaJeztah
Copy link
Member Author

vendor is failing because we didn't backport the vndr update from moby#39216 yet;

15:20:09 The result of vndr differs
15:20:09 
15:20:09  D vendor/github.com/Microsoft/go-winio/go.mod
15:20:09

I'll have to rebase this one once #316 is merged

@andrewhsu andrewhsu requested a review from ddebroy August 8, 2019 17:48
@thaJeztah
Copy link
Member Author

From the PR:

This is to fix a regression here: https://github.com/moby/moby/blob/master/daemon/graphdriver/windows/windows.go#L343 if the fallback code needs to call vhd.DetachVhd due to in-use the call with fail with E_INVALID_PARAMETER due to the vendored update to go-winio previously.

@ddebroy
Copy link

ddebroy commented Aug 8, 2019

LGTM

@andrewhsu andrewhsu merged commit 9f9dab0 into docker-archive:19.03 Aug 8, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_revendor_go_winio branch August 8, 2019 19:47
@mitchcapper mitchcapper mentioned this pull request Nov 13, 2019
Closed
@StefanScherer StefanScherer mentioned this pull request Nov 13, 2019
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jterry75 jterry75 jterry75 approved these changes

@ddebroy ddebroy Awaiting requested review from ddebroy

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
19.03.2
Development

Successfully merging this pull request may close these issues.
5 participants
@thaJeztah @ddebroy @jterry75 @andrewhsu @kevpar