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

Skip to content

oci: use conmon for exec again #5245

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 1 commit into from
Aug 25, 2021
Merged

oci: use conmon for exec again #5245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 0 additions & 61 deletions internal/dirnotifier/dirnotifier.go
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions internal/dirnotifier/dirnotifier_test.go
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions internal/dirnotifier/suite_test.go
View file
Open in desktop

This file was deleted.

21 changes: 13 additions & 8 deletions internal/oci/oci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package oci

import (
"bytes"
"fmt"
"io"
"os"
Expand All @@ -10,10 +11,8 @@ import (
"syscall"
"time"

"github.com/cri-o/cri-o/internal/dirnotifier"
"github.com/cri-o/cri-o/pkg/config"
"github.com/cri-o/cri-o/server/cri/types"
"github.com/fsnotify/fsnotify"
rspec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"golang.org/x/net/context"
Expand Down Expand Up @@ -44,7 +43,6 @@ type Runtime struct {
config *config.Config
runtimeImplMap map[string]RuntimeImpl
runtimeImplMapMutex sync.RWMutex
execNotifier *dirnotifier.DirectoryNotifier
}

// RuntimeImpl is an interface used by the caller to interact with the
Expand Down Expand Up @@ -83,14 +81,9 @@ func New(c *config.Config) (*Runtime, error) {
return nil, errors.Wrapf(err, "create oci runtime pid dir")
}

notifier, err := dirnotifier.New(execNotifyDir, fsnotify.Write, fsnotify.Rename)
if err != nil {
return nil, err
}
return &Runtime{
config: c,
runtimeImplMap: make(map[string]RuntimeImpl),
execNotifier: notifier,
}, nil
}

Expand Down Expand Up @@ -433,6 +426,18 @@ func (r *Runtime) ReopenContainerLog(ctx context.Context, c *Container) error {
return impl.ReopenContainerLog(ctx, c)
}

// ExecSyncError wraps command's streams, exit code and error on ExecSync error.
type ExecSyncError struct {
Stdout bytes.Buffer
Stderr bytes.Buffer
ExitCode int32
Err error
}

func (e *ExecSyncError) Error() string {
return fmt.Sprintf("command error: %+v, stdout: %s, stderr: %s, exit code %d", e.Err, e.Stdout.Bytes(), e.Stderr.Bytes(), e.ExitCode)
}

// BuildContainerdBinaryName() is responsible for ensuring the binary passed will
// be properly converted to the containerd binary naming pattern.
//
Expand Down
Loading