mirror of
https://github.com/containers/podman.git
synced 2025-11-01 02:42:11 +08:00
d32863bbb4
The initial version of libimage changed the order of layers which has now been restored to remain backwards compatible. Further changes: * Fix a bug in the journald logging which requires to strip trailing new lines from the message. The system tests did not pass due to empty new lines. Triggered by changing the default logger to journald in containers/common. * Fix another bug in the journald logging which embedded the container ID inside the message rather than the specifid field. That surfaced in a preceeding whitespace of each log line which broke the system tests. * Alter the system tests to make sure that the k8s-file and the journald logging drivers are executed. * A number of e2e tests have been changed to force the k8s-file driver to make them pass when running inside a root container. * Increase the timeout in a kill test which seems to take longer now. Reasons are unknown. Tests passed earlier and no signal-related changes happend. It may be CI VM flake since some system tests but other flaked. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
63 lines
1.9 KiB
Go
63 lines
1.9 KiB
Go
package libimage
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// EventType indicates the type of an event. Currently, there is only one
|
|
// supported type for container image but we may add more (e.g., for manifest
|
|
// lists) in the future.
|
|
type EventType int
|
|
|
|
const (
|
|
// EventTypeUnknown is an uninitialized EventType.
|
|
EventTypeUnknown EventType = iota
|
|
// EventTypeImagePull represents an image pull.
|
|
EventTypeImagePull
|
|
// EventTypeImagePush represents an image push.
|
|
EventTypeImagePush
|
|
// EventTypeImageRemove represents an image removal.
|
|
EventTypeImageRemove
|
|
// EventTypeImageLoad represents an image being loaded.
|
|
EventTypeImageLoad
|
|
// EventTypeImageSave represents an image being saved.
|
|
EventTypeImageSave
|
|
// EventTypeImageTag represents an image being tagged.
|
|
EventTypeImageTag
|
|
// EventTypeImageUntag represents an image being untagged.
|
|
EventTypeImageUntag
|
|
// EventTypeImageMount represents an image being mounted.
|
|
EventTypeImageMount
|
|
// EventTypeImageUnmount represents an image being unmounted.
|
|
EventTypeImageUnmount
|
|
)
|
|
|
|
// Event represents an event such an image pull or image tag.
|
|
type Event struct {
|
|
// ID of the object (e.g., image ID).
|
|
ID string
|
|
// Name of the object (e.g., image name "quay.io/containers/podman:latest")
|
|
Name string
|
|
// Time of the event.
|
|
Time time.Time
|
|
// Type of the event.
|
|
Type EventType
|
|
}
|
|
|
|
// writeEvent writes the specified event to the Runtime's event channel. The
|
|
// event is discarded if no event channel has been registered (yet).
|
|
func (r *Runtime) writeEvent(event *Event) {
|
|
select {
|
|
case r.eventChannel <- event:
|
|
// Done
|
|
case <-time.After(2 * time.Second):
|
|
// The Runtime's event channel has a buffer of size 100 which
|
|
// should be enough even under high load. However, we
|
|
// shouldn't block too long in case the buffer runs full (could
|
|
// be an honest user error or bug).
|
|
logrus.Warnf("Discarding libimage event which was not read within 2 seconds: %v", event)
|
|
}
|
|
}
|