Skip to content

Enable devmapper tests#4821

Merged
crosbymichael merged 3 commits intocontainerd:masterfrom
mxpv:tests
Dec 14, 2020
Merged

Enable devmapper tests#4821
crosbymichael merged 3 commits intocontainerd:masterfrom
mxpv:tests

Conversation

@mxpv
Copy link
Copy Markdown
Member

@mxpv mxpv commented Dec 9, 2020

Enables the devmapper tests back (after disabling them in #4719 (comment))

We have included a few patches recently that affected unit tests:

Signed-off-by: Maksym Pavlenko [email protected]

@mxpv mxpv force-pushed the tests branch 2 times, most recently from 369e1cb to c15303c Compare December 9, 2020 08:00
@containerd containerd deleted a comment from theopenlab-ci Bot Dec 9, 2020
@containerd containerd deleted a comment from theopenlab-ci Bot Dec 9, 2020
@containerd containerd deleted a comment from theopenlab-ci Bot Dec 9, 2020
@mxpv mxpv force-pushed the tests branch 2 times, most recently from 66b1599 to e73760c Compare December 9, 2020 16:38
@containerd containerd deleted a comment from theopenlab-ci Bot Dec 9, 2020
@containerd containerd deleted a comment from theopenlab-ci Bot Dec 9, 2020
@containerd containerd deleted a comment from k8s-ci-robot Dec 9, 2020
@containerd containerd deleted a comment from theopenlab-ci Bot Dec 9, 2020
mxpv added 2 commits December 9, 2020 09:34
Signed-off-by: Maksym Pavlenko <[email protected]>
Signed-off-by: Maksym Pavlenko <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Dec 9, 2020

Build succeeded.

@mxpv mxpv marked this pull request as ready for review December 9, 2020 18:25
Copy link
Copy Markdown
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

@renzhengeek : do you have the opportunity to validate this change in your environment?


// Don't spam logs
if attempt%10 == 0 {
log.G(ctx).WithError(retryErr).Warnf("retrying... (%d of %d)", attempt, maxRetries)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is from the original code, but how about logging the total number of retries at the end? The current implementation could log retrying... (10 of 100) even if retries 19 times.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I don't know if there is any value in this information. BUSY related errors are usually hard to measure, and if it takes 19 attempts on one instance, doesn't mean that the same will apply on another one. This warning is more to convey that we're doing something more than 10 times and we'll likely be failing anyway.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit a9cc801 into containerd:master Dec 14, 2020
@mxpv mxpv deleted the tests branch December 16, 2020 23:03
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.

5 participants