Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix issues with PLEG events for kata #6603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Feb 8, 2023
Merged

Fix issues with PLEG events for kata #6603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c80ae0a
runtimeVM: notify server that the container exited
littlejawa Feb 2, 2023
4cf3d37
runtimeVM: ignore missing shim path for deleted containers
littlejawa Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/oci/oci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func (r *Runtime) newRuntimeImpl(c *Container) (RuntimeImpl, error) {
}

if rh.RuntimeType == config.RuntimeTypeVM {
return newRuntimeVM(rh.RuntimePath, rh.RuntimeRoot, rh.RuntimeConfigPath), nil
return newRuntimeVM(rh.RuntimePath, rh.RuntimeRoot, rh.RuntimeConfigPath, r.config.RuntimeConfig.ContainerExitsDir), nil
}

if rh.RuntimeType == config.RuntimeTypePod {
Expand Down
16 changes: 15 additions & 1 deletion internal/oci/runtime_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ type runtimeVM struct {
path string
fifoDir string
configPath string
exitsPath string
ctx context.Context
client *ttrpc.Client
task task.TaskService
Expand All @@ -68,7 +69,7 @@ const (
)

// newRuntimeVM creates a new runtimeVM instance
func newRuntimeVM(path, root, configPath string) RuntimeImpl {
func newRuntimeVM(path, root, configPath, exitsPath string) RuntimeImpl {
logrus.Debug("oci.newRuntimeVM() start")
defer logrus.Debug("oci.newRuntimeVM() end")

Expand All @@ -87,6 +88,7 @@ func newRuntimeVM(path, root, configPath string) RuntimeImpl {
return &runtimeVM{
path: path,
configPath: configPath,
exitsPath: exitsPath,
fifoDir: filepath.Join(root, "crio", "fifo"),
ctx: context.Background(),
ctrs: make(map[string]containerInfo),
Expand Down Expand Up @@ -269,6 +271,11 @@ func (r *runtimeVM) StartContainer(ctx context.Context, c *Container) error {
go func() {
_, err := r.wait(c.ID(), "")
if err == nil {
// create a file on the exitsDir so that cri-o server can detect it
path := filepath.Join(r.exitsPath+"/", c.ID())
if fileErr := os.WriteFile(path, []byte("Exited"), 0o644); err != nil {
log.Warnf(ctx, "Unable to write exit file %v", fileErr)
}
if err1 := r.updateContainerStatus(ctx, c); err1 != nil {
log.Warnf(ctx, "Error updating container status %v", err1)
}
Expand Down Expand Up @@ -635,6 +642,13 @@ func (r *runtimeVM) updateContainerStatus(ctx context.Context, c *Container) err
addressPath := filepath.Join(c.BundlePath(), "address")
data, err := os.ReadFile(addressPath)
if err != nil {
// If the container is actually removed, this error is expected and should be ignored.
// In this case, the container's status should be "Stopped".
if c.state.Status == ContainerStateStopped {
log.Debugf(ctx, "Skipping status update for: %+v", c.state)
return nil
}

log.Warnf(ctx, "Failed to read shim address: %v", err)
return errors.New("runtime not correctly setup")
}
Expand Down