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: v1.6.0-rc.1
Choose a base ref
...
head repository: containerd/containerd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.6.0-rc.1-4-g731518417
Choose a head ref
  • 4 commits
  • 4 files changed
  • 4 contributors

Commits on Jan 20, 2022

  1. fix empty scopes return

    Signed-off-by: ye.sijun <[email protected]>
    junnplus committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    936faf9 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #6463 from Junnplus/empty-scope

    Fix empty scopes return
    estesp authored Jan 20, 2022
    Configuration menu
    Copy the full SHA
    ab8d99c View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2022

  1. fix: should not send 137 code event if cmd is notfound

    ShimV2 has shim.Delete command to cleanup task's temporary resource,
    like bundle folder. Since the shim server exits and no persistent store
    is for task's exit code, the result of shim.Delete is always 137 exit
    code, like the task has been killed.
    
    And the result of shim.Delete can be used as task event only when the
    shim server is killed somehow after container is running. Therefore,
    dockerd, which watches task exit event to update status of container,
    can report correct status.
    
    Back to the issue #6429, the container is not running because the
    entrypoint is not found. Based on this design, we should not send
    137 exitcode event to subscriber.
    
    This commit is aimed to remove shim instance first and then the
    `cleanupAfterDeadShim` should not send event.
    
    Similar Issue: #4769
    Fix #6429
    
    Signed-off-by: Wei Fu <[email protected]>
    fuweid committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    31a710c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #6465 from fuweid/fix-issue-6429

    fix: should not send 137 code event if cmd is notfound
    mxpv authored Jan 21, 2022
    Configuration menu
    Copy the full SHA
    7315184 View commit details
    Browse the repository at this point in the history
Loading