Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

Random-Liu
Copy link
Member

Please feel free to comment if you want to add anything or change anything.

Signed-off-by: Lantao Liu [email protected]

@codecov-io
Copy link

codecov-io commented Mar 9, 2019

Codecov Report

Merging #3086 into release/1.2 will decrease coverage by 2.9%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.2    #3086      +/-   ##
===============================================
- Coverage        43.75%   40.84%   -2.91%     
===============================================
  Files              101       70      -31     
  Lines            10736     9395    -1341     
===============================================
- Hits              4697     3837     -860     
+ Misses            5309     5001     -308     
+ Partials           730      557     -173
Flag Coverage Δ
#linux ?
#windows 40.84% <ø> (ø) ⬆️
Impacted Files Coverage Δ
snapshots/native/native.go 1.78% <0%> (-41.52%) ⬇️
archive/tar.go 16.99% <0%> (-26.8%) ⬇️
metadata/snapshot.go 21.53% <0%> (-24.28%) ⬇️
content/local/writer.go 56.86% <0%> (-0.99%) ⬇️
gc/scheduler/scheduler.go 66.34% <0%> (-0.97%) ⬇️
oci/spec_opts.go 20.49% <0%> (-0.28%) ⬇️
mount/temp_unix.go
sys/reaper_linux.go
services/server/server_linux.go
sys/env.go
... and 27 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 075e1ed...6878e2b. Read the comment docs.

@fuweid
Copy link
Member

fuweid commented Mar 11, 2019

Hi @Random-Liu , I want to cherry-pick #2876 into release 1.2. 😄

see #3087

@fuweid
Copy link
Member

fuweid commented Mar 11, 2019

and are we need the runC CVE patch for this release?

see #3082

cc @thaJeztah

@estesp
Copy link
Member

estesp commented Mar 11, 2019

release notes need an update for #3087 and #3082

@Random-Liu
Copy link
Member Author

are we need the runC CVE patch for this release?

Good, we need the runc fix as well. Happy that it gets in!

@Random-Liu Random-Liu force-pushed the prepare-release-1-2-5 branch from dc02b79 to 8f8ece7 Compare March 11, 2019 17:56
@Random-Liu
Copy link
Member Author

@fuweid @estesp Done.

@Random-Liu Random-Liu force-pushed the prepare-release-1-2-5 branch 3 times, most recently from 6009a37 to 2588620 Compare March 12, 2019 00:11
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM!

The failed CI doesn't relate to this change. @Random-Liu could you mind to rerun it again? Thanks

@Random-Liu
Copy link
Member Author

@fuweid Triggered the rerun.

@Random-Liu
Copy link
Member Author

One more fix needed: containerd/cri#1085

Will get it in today.

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

Choose a reason for hiding this comment

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

existent, on line 29 too

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

Copy link
Member

Choose a reason for hiding this comment

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

* support for GC references to content from snapshot and container objects. https://github.com/containerd/containerd/pull/3080

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

@dmcgowan
Copy link
Member

dmcgowan commented Mar 12, 2019

Also #3090 for generated release notes. Putting my test generation here https://gist.github.com/dmcgowan/93905b44c5888d92440e9efac93f7659

@crosbymichael
Copy link
Member

LGTM

@Random-Liu Random-Liu force-pushed the prepare-release-1-2-5 branch from 2588620 to 92da880 Compare March 12, 2019 21:34
@Random-Liu
Copy link
Member Author

I think everything is ready. :)

@estesp
Copy link
Member

estesp commented Mar 13, 2019

I think we usually include the version/version.go bump in the "prepare" PR; so can put repush with that and then I think we're ready to merge

@Random-Liu
Copy link
Member Author

Random-Liu commented Mar 13, 2019

I think we usually include the version/version.go bump in the "prepare" PR; so can put repush with that and then I think we're ready to merge

Oops... Missed that. Will do! And good catch.

Signed-off-by: Lantao Liu <[email protected]>
@Random-Liu Random-Liu force-pushed the prepare-release-1-2-5 branch from 92da880 to 6878e2b Compare March 13, 2019 00:46
@Random-Liu
Copy link
Member Author

@estesp Done. :)

@fuweid
Copy link
Member

fuweid commented Mar 13, 2019

--- FAIL: TestContentClient/CommitErrorState (3.69s)
        testsuite.go:101: Cleanup failed: unknown
            github.com/containerd/containerd/errdefs.init
            	C:/gopath/src/github.com/containerd/containerd/errdefs/errors.go:39
            github.com/containerd/containerd/content.init
            	<autogenerated>:1
            github.com/containerd/containerd.init
            	<autogenerated>:1
            main.init
            	<autogenerated>:1
            runtime.main
            	C:/go/src/runtime/proc.go:189
            runtime.goexit
            	C:/go/src/runtime/asm_amd64.s:1333
            remove C:\Program Files\containerd\root-test\io.containerd.content.v1.content\ingest\9101c5f249b4cb38a50dddda86a787c09f31099573c87c525fc50774ac21d05d\.tmp-updatedat366893897: The process cannot access the file because it is being used by another process.
            github.com/containerd/containerd/errdefs.FromGRPC
            	C:/gopath/src/github.com/containerd/containerd/errdefs/grpc.go:98
            github.com/containerd/containerd/content/proxy.(*proxyContentStore).Abort
            	C:/gopath/src/github.com/containerd/containerd/content/proxy/content_store.go:187
            github.com/containerd/containerd.newContentStore.func2
            	C:/gopath/src/github.com/containerd/containerd/content_test.go:60
            github.com/containerd/containerd/content/testsuite.makeTest.func1.1
            	C:/gopath/src/github.com/containerd/containerd/content/testsuite/testsuite.go:100
            github.com/containerd/containerd/content/testsuite.makeTest.func1
            	C:/gopath/src/github.com/containerd/containerd/content/testsuite/testsuite.go:121
            testing.tRunner
            	C:/go/src/testing/testing.go:827
            runtime.goexit
            	C:/go/src/runtime/asm_amd64.s:1333
            failed to abort c1-commiterror-state
            github.com/containerd/containerd.newContentStore.func2
            	C:/gopath/src/github.com/containerd/containerd/content_test.go:61
            github.com/containerd/containerd/content/testsuite.makeTest.func1.1
            	C:/gopath/src/github.com/containerd/containerd/content/testsuite/testsuite.go:100
            github.com/containerd/containerd/content/testsuite.makeTest.func1
            	C:/gopath/src/github.com/containerd/containerd/content/testsuite/testsuite.go:121
            testing.tRunner
            	C:/go/src/testing/testing.go:827
            runtime.goexit
            	C:/go/src/runtime/asm_amd64.s:1333

flaky case in windows 😞 need to rerun it again.

@dmcgowan
Copy link
Member

Re-kicked it, and LGTM, updated https://gist.github.com/dmcgowan/93905b44c5888d92440e9efac93f7659

@estesp estesp merged commit bb71b10 into containerd:release/1.2 Mar 13, 2019
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.

7 participants