boltdb/bolt==>bbolt, revendor Microsoft/*, Windows compilation.#2268
boltdb/bolt==>bbolt, revendor Microsoft/*, Windows compilation.#2268ctelfer merged 6 commits intomoby:masterfrom
Conversation
Signed-off-by: John Howard <[email protected]>
Signed-off-by: John Howard <[email protected]>
|
Could someone help me understand what this failure might mean? Or help debug it? I'm not that familiar with libnetwork. Tentatively possible is a regression due to boltdb, purely based on supposition in that it has db in the name of the test. |
|
I suspect this is a flaky test. It doesn't look like I'll give it a third CI attempt... |
|
Ha, third time it passed. Pretty sure that's just a flaky test 😞 @thaJeztah FYI. |
|
Yes. I dont know why and how networkdb fails for boltdb changes. |
|
Could you squash these three commits? Looks like they should go together;
|
Signed-off-by: John Howard <[email protected]> As well as bumping, libkv now requires go.etcd.io/bolt rather than boltdb/bolt. Hence removed bolt from vendor.conf, vendored go.etcd.io/bbot @ v1.3.1-etcd.8 and rerun vndr.
Signed-off-by: John Howard <[email protected]>
Signed-off-by: John Howard <[email protected]>
Signed-off-by: John Howard <[email protected]>
@thaJeztah Done |
|
LGTM |
|
thanks! |
|
Who can merge this? I'd really like to get the fix into moby/moby due to the number of people hitting the issue |
Signed-off-by: John Howard [email protected]
Almost fixes #1950.
Most of this PR is vendoring.
I've bumped Microsoft/hcsshim and Microsoft/go-winio to the latest versions, which are the same as the ones currently vendored in the moby/moby repo.
I've removed the unused syndtr/gocapability
Replaced boltdb/bolt with go.etc.io/bbolt. Specifically because boltdb/bolt is no longer being maintained, and we need this fix Fix Windows flock/funlock race etcd-io/bbolt#122 to fix Saving endpoint to store fails in windows under concurrent load #1950. That was merged in https://github.com/etcd-io/bbolt/releases/tag/v1.3.1-etcd.8.
I've also made
go build ./…closer to building on Windows. I should really tackle vishvanada\netns one day as that's the next blocker for that. But not for this PR.Once all this is merged, we need a follow-on PR to revendor libnetwork into moby/moby to finally fix #1950 (which should really be open in the moby/moby repo, but not important.)
@carlfischer1 FYI
@mavenugo PTAL