Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit b6eaafe

Browse files
cpuguy83thaJeztah
authored andcommitted
Propagate GetContainer error from event processor
Before this change we just accept that any error is "not found" and it could be something else, but even if it it is just a "not found" kind of error this should be dealt with from the container store and not the event processor. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 54e30a62d3ca39c912c8e291e80cfbf80860d607) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: fd169c00bf19a392276d52867c1a5032d22b7b21 Component: engine
1 parent 5334d2e commit b6eaafe

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

components/engine/daemon/monitor.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package daemon // import "github.com/docker/docker/daemon"
22

33
import (
44
"context"
5-
"errors"
6-
"fmt"
75
"runtime"
86
"strconv"
97
"time"
@@ -12,6 +10,7 @@ import (
1210
"github.com/docker/docker/container"
1311
libcontainerdtypes "github.com/docker/docker/libcontainerd/types"
1412
"github.com/docker/docker/restartmanager"
13+
"github.com/pkg/errors"
1514
"github.com/sirupsen/logrus"
1615
)
1716

@@ -29,8 +28,8 @@ func (daemon *Daemon) setStateCounter(c *container.Container) {
2928
// ProcessEvent is called by libcontainerd whenever an event occurs
3029
func (daemon *Daemon) ProcessEvent(id string, e libcontainerdtypes.EventType, ei libcontainerdtypes.EventInfo) error {
3130
c, err := daemon.GetContainer(id)
32-
if c == nil || err != nil {
33-
return fmt.Errorf("no such container: %s", id)
31+
if err != nil {
32+
return errors.Wrapf(err, "could not find container %s", id)
3433
}
3534

3635
switch e {

0 commit comments

Comments
 (0)