Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go.mod, libct: switch to google.golang.org/protobuf #2807

Merged
merged 2 commits into from
Apr 1, 2021

Conversation

kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Feb 12, 2021

Switch from github.com/golang/protobuf (which appears to be obsoleted)
to google.golang.org/protobuf (which appears to be a replacement).

This needs a bump of checkpoint-restore/go-criu to include
checkpoint-restore/go-criu#43.

Addresses: #2627 (#2627 (comment))

NOTE: this is a draft since it uses an untagged version of go-criu. Once a tagged release is available, I'll update this PR and move it out of draft

@kolyshkin kolyshkin force-pushed the google-golang-protobuf branch 2 times, most recently from 04311aa to a186be1 Compare February 13, 2021 01:54
@kolyshkin
Copy link
Contributor Author

The binary size has actually decreased a bit:

For go 1.15:

[kir@kir-rhat runc]$ size runc.*15
   text	   data	    bss	    dec	    hex	filename
7790881	3968272	 221488	11980641	 b6cf61	runc.goog.go115
7806321	3972945	 221584	12000850	 b71e52	runc.master.go115

For go 1.16:

[kir@kir-rhat runc]$ size runc.*16
   text	   data	    bss	    dec	    hex	filename
7176335	3658240	 222488	11057063	 a8b7a7	runc.goog.go116
7199983	3664080	 222616	11086679	 a92b57	runc.master.go116

In case log level is less than debug, this code does nothing,
so let's add a condition and skip it entirely.

Add a test case to make sure this code path is hit.

Signed-off-by: Kir Kolyshkin <[email protected]>
Switch from github.com/golang/protobuf (which appears to be obsoleted)
to google.golang.org/protobuf (which appears to be a replacement).

This needs a bump to go-criu v5.

[v2: fix debug print in criuSwrk]
[v3: switch to go-criu v5]

Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin kolyshkin marked this pull request as ready for review March 4, 2021 17:01
@kolyshkin
Copy link
Contributor Author

No longer a draft. @adrianreber @AkihiroSuda @mrunalp PTAL

@kolyshkin kolyshkin added this to the 1.0.0-rc94 milestone Mar 4, 2021
@kolyshkin
Copy link
Contributor Author

cross-i386 failed with:

panic: getImages error exit status 1 (output: curl: (22) The requested URL returned error: 502 
Failed to get https://github.com/docker-library/busybox/raw/dist-i386/stable/glibc/busybox.tar.xz
)

goroutine 1 [running]:
github.com/opencontainers/runc/libcontainer/integration.init.1()
	/home/runner/work/runc/runc/libcontainer/integration/utils_test.go:39 +0x378
FAIL	github.com/opencontainers/runc/libcontainer/integration	9.407s

This is a temp github issue :( which I'm seeing for the first time, and I think we can use curl's retry to mitigate. Opened #2833

@kolyshkin kolyshkin mentioned this pull request Mar 4, 2021
Copy link
Contributor

@adrianreber adrianreber left a comment

Choose a reason for hiding this comment

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

Looks good to me

@kolyshkin
Copy link
Contributor Author

Ughm... I have almost reimplemented the first commit of this PR from scratch when I was looking into the checkpointing code today -- thought I never finished it.

@kolyshkin
Copy link
Contributor Author

close/open to re-kick ci

@kolyshkin kolyshkin closed this Apr 1, 2021
@kolyshkin kolyshkin reopened this Apr 1, 2021
@kolyshkin kolyshkin merged commit bed4d89 into opencontainers:master Apr 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants