Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: containerd/containerd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4f03e10
Choose a base ref
...
head repository: containerd/containerd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e1fe74
Choose a head ref
  • 11 commits
  • 14 files changed
  • 8 contributors

Commits on Nov 16, 2023

  1. Enhance container image unpack client logs

    Adds debug message per layer unpacking and adds duration field to
    the existing image unpacking debug message.
    
    Signed-off-by: Austin Vazquez <[email protected]>
    (cherry picked from commit 01c4421)
    Signed-off-by: Austin Vazquez <[email protected]>
    austinvazquez committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    5930a37 View commit details
    Browse the repository at this point in the history
  2. cri: fix using the pinned label to pin image

    Signed-off-by: Iceber Gu <[email protected]>
    (cherry picked from commit 7f7ba31)
    Signed-off-by: Iceber Gu <[email protected]>
    Iceber committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    8dc8618 View commit details
    Browse the repository at this point in the history
  3. cri: fix update of pinned label for images

    Signed-off-by: Iceber Gu <[email protected]>
    (cherry picked from commit 2e014fa)
    Signed-off-by: Iceber Gu <[email protected]>
    Iceber committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    a2b16d7 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #9379 from austinvazquez/cherry-pick-v1.7-01c44214…

    …7fd084cc0e7e8b45074b940f5c6bbdba
    
    [release/1.7] Enhance container image unpack client logs
    fuweid authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    bb0e42a View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Merge pull request #9381 from Iceber/fix_pin_image_1.7

    [release/1.7] cri: fix using the pinned label to pin image
    estesp authored Nov 17, 2023
    Configuration menu
    Copy the full SHA
    b1c6f01 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. fix: deflake TestCRIImagePullTimeout/HoldingContentOpenWriter

    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 <[email protected]>
    fuweid authored and ruiwen-zhao committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    d1aab27 View commit details
    Browse the repository at this point in the history
  2. integration: reproduce #9347

    Signed-off-by: Wei Fu <[email protected]>
    fuweid authored and ruiwen-zhao committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    3284939 View commit details
    Browse the repository at this point in the history
  3. remotes/docker: close connection if no more data

    Close connection if no more data. It's to fix false alert filed by image
    pull progress.
    
    ```
    dst = OpenWriter (--> Content Store)
    
    src = Fetch
            Open (--> Registry)
            Mark it as active request
    
    Copy(dst, src) (--> Keep updating total received bytes)
    
       ^
       |  (Active Request > 0, but total received bytes won't be updated)
       v
    
    defer src.Close()
    content.Commit(dst)
    ```
    
    Before migrating to transfer service, CRI plugin doesn't limit global
    concurrent downloads for ImagePulls. Each ImagePull requests have 3 concurrent
    goroutines to download blob and 1 goroutine to unpack blob. Like ext4
    filesystem [1][1], the fsync from content.Commit may sync unrelated dirty pages
    into disk. The host is running under IO pressure, and then the content.Commit
    will take long time and block other goroutines. If httpreadseeker
    doesn't close the connection after io.EOF, this connection will be
    considered as active. The pull progress reporter reports there is no
    bytes transfered and cancels the ImagePull.
    
    The original 1-minute timeout[2][2] is from kubelet settting. Since CRI-plugin
    can't limit the total concurrent downloads, this patch is to update 1-minute
    to 5-minutes to prevent from unexpected cancel.
    
    [1]: https://lwn.net/Articles/842385/
    [2]: https://github.com/kubernetes/kubernetes/blob/release-1.23/pkg/kubelet/config/flags.go#L45-L48
    
    Signed-off-by: Wei Fu <[email protected]>
    fuweid authored and ruiwen-zhao committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    2068061 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Merge pull request #9409 from ruiwen-zhao/progress-fix-1.7

    [release/1.7] fix: ImagePull should close http connection if there is no available data to read.
    samuelkarp authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    21b85e9 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Add release notes for v1.7.10

    Signed-off-by: ruiwen-zhao <[email protected]>
    ruiwen-zhao committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    a995fe3 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Merge pull request #9426 from ruiwen-zhao/1.7.10

    Add release notes for v1.7.10
    dmcgowan authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    4e1fe74 View commit details
    Browse the repository at this point in the history
Loading