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/fifo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.0
Choose a base ref
...
head repository: containerd/fifo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 39bc37d3b045af5a25ca2c62586d40b2cd1eb96c
Choose a head ref
  • 8 commits
  • 7 files changed
  • 7 contributors

Commits on Jan 29, 2021

  1. fifo.Close(): prevent possible panic if fifo is nil

    I'm not sure if this is the right approach, and synchronisation should probably
    be added elsewhere to fix the underlying issue.
    
    Trying to prevent a panic that was seen on container restore in th docker daemon:
    
        panic: runtime error: invalid memory address or nil pointer dereference
        [signal SIGSEGV: segmentation violation code=0x1 addr=0x10 pc=0x5586c892a7a4]
    
        goroutine 420 [running]:
        github.com/docker/docker/vendor/github.com/containerd/fifo.(*fifo).Close(0x0, 0x0, 0x0)
                /go/src/github.com/docker/docker/vendor/github.com/containerd/fifo/fifo.go:208 +0x44
        github.com/docker/docker/vendor/github.com/containerd/containerd/cio.(*cio).Close(0xc000d06f60, 0x5586cb5654d0, 0xc000d8e9e8)
                /go/src/github.com/docker/docker/vendor/github.com/containerd/containerd/cio/io.go:203 +0x90
        github.com/docker/docker/libcontainerd/remote.(*client).Restore.func1(0xc0008bf820, 0xc0008a2040)
                /go/src/github.com/docker/docker/libcontainerd/remote/client.go:86 +0x5a
        github.com/docker/docker/libcontainerd/remote.(*client).Restore(0xc00098e5b0, 0x5586cb61c7c0, 0xc000052088, 0xc0011b6500, 0x40, 0xc0008bf810, 0x5586cb05cf00, 0xffffffffffffffff, 0x0, 0x0, ...)
                /go/src/github.com/docker/docker/libcontainerd/remote/client.go:107 +0x923
        github.com/docker/docker/daemon.(*Daemon).restore.func3(0xc00079d9e0, 0xc000a38230, 0xc00000c1e0, 0xc00079d9a8, 0xc000d84f00, 0xc000d84ed0, 0xc000d84ea0, 0xc00128a280)
                /go/src/github.com/docker/docker/daemon/daemon.go:351 +0x48a
        created by github.com/docker/docker/daemon.(*Daemon).restore
                /go/src/github.com/docker/docker/daemon/daemon.go:319 +0x4b3
    
    If the fifo is nil, there's nothing to be done in Close(), so returning early
    in that situation.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    80cf87d View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2021

  1. Update branch name in GitHub Actions

    Signed-off-by: Phil Estes <[email protected]>
    estesp committed Jun 19, 2021
    Configuration menu
    Copy the full SHA
    13f52b1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6cca7cf View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2021

  1. Merge pull request #32 from thaJeztah/prevent_npe

    fifo.Close(): prevent possible panic if fifo is nil
    dmcgowan authored Sep 15, 2021
    Configuration menu
    Copy the full SHA
    60d22e8 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2021

  1. replace pkg/errors

    Signed-off-by: Zou Nengren <[email protected]>
    zounengren committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    8343682 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #41 from zoues/replaceerror

    replace pkg/errors
    fuweid authored Sep 22, 2021
    Configuration menu
    Copy the full SHA
    0a08290 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2022

  1. fifo_test: Add 2 tests for closing after reading

    The first test verifies that a Read() unblocks when we're closing the
    reader.
    
    The second test verifies that a Read() also unblocks when we're closing
    the reader, even if a writer is pushing some bytes from the other end of
    the pipe.
    
    Signed-off-by: Samuel Ortiz <[email protected]>
    Samuel Ortiz committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    1be9adf View commit details
    Browse the repository at this point in the history
  2. Merge pull request #42 from sameo/topic/darwin

    fifo_test: Add 2 tests for closing after reading
    dmcgowan authored Jan 26, 2022
    Configuration menu
    Copy the full SHA
    39bc37d View commit details
    Browse the repository at this point in the history
Loading