github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fix: deflake TestCRIImagePullTimeout/HoldingContentOpenWriter

Browse Source 
The new active request is filed and there is no bytes read yet when the
progress reporter just wakes up. If the timeout / 2 is less than the
minPullProgressReportInternal, it's easy to file false alert.

We should remove the minPullProgressReportInternal limit.

Fixes: #8024

Signed-off-by: Wei Fu <fuweid89@gmail.com>
This commit is contained in:
Wei Fu 2023-11-15 18:35:26 +08:00
parent 349c8d12c8
commit 2e9686c054
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cri/server/images/image_pull.go
View File

@ -555,9 +555,6 @@ func newTransport() *http.Transport {
//} //}
const ( const (
// minPullProgressReportInternal is used to prevent the reporter from
// eating more CPU resources
minPullProgressReportInternal = 5 * time.Second
// defaultPullProgressReportInterval represents that how often the // defaultPullProgressReportInterval represents that how often the
// reporter checks that pull progress. // reporter checks that pull progress.
defaultPullProgressReportInterval = 10 * time.Second defaultPullProgressReportInterval = 10 * time.Second
@ -605,10 +602,6 @@ func (reporter *pullProgressReporter) start(ctx context.Context) {
// check progress more frequently if timeout < default internal // check progress more frequently if timeout < default internal
if reporter.timeout < reportInterval { if reporter.timeout < reportInterval {
reportInterval = reporter.timeout / 2 reportInterval = reporter.timeout / 2
if reportInterval < minPullProgressReportInternal {
reportInterval = minPullProgressReportInternal
}
} }
var ticker = time.NewTicker(reportInterval) var ticker = time.NewTicker(reportInterval)