diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2019-01-18 17:35:09 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-01-18 17:36:02 -0800 |
| commit | c1be25b78d89a3a55a32a7aa10724134eda9813d (patch) | |
| tree | bb5c09cb94ab212c158041b260ed0bb480e2a9d5 /runsc/container/fs.go | |
| parent | c0a981629cf44688687548490c5e665d851afe06 (diff) | |
Scrub runsc error messages
Removed "error" and "failed to" prefix that don't add value
from messages. Adjusted a few other messages. In particular,
when the container fail to start, the message returned is easier
for humans to read:
$ docker run --rm --runtime=runsc alpine foobar
docker: Error response from daemon: OCI runtime start failed: <path> did not terminate sucessfully: starting container: starting root container [foobar]: starting sandbox: searching for executable "foobar", cwd: "/", $PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin": no such file or directory
Closes #77
PiperOrigin-RevId: 230022798
Change-Id: I83339017c70dae09e4f9f8e0ea2e554c4d5d5cd1
Diffstat (limited to 'runsc/container/fs.go')
| -rw-r--r-- | runsc/container/fs.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runsc/container/fs.go b/runsc/container/fs.go index 97195550f..998160487 100644 --- a/runsc/container/fs.go +++ b/runsc/container/fs.go @@ -94,14 +94,14 @@ func setupFS(spec *specs.Spec, conf *boot.Config, bundleDir string) ([]specs.Mou flags |= syscall.MS_BIND log.Infof("Mounting src: %q, dst: %q, flags: %#x", m.Source, dst, flags) if err := specutils.Mount(m.Source, dst, m.Type, flags); err != nil { - return nil, fmt.Errorf("failed to mount %v: %v", m, err) + return nil, fmt.Errorf("mounting %v: %v", m, err) } // Make the mount a slave, so that for recursive bind mount, umount won't // propagate to the source. flags = syscall.MS_SLAVE | syscall.MS_REC if err := syscall.Mount("", dst, "", uintptr(flags), ""); err != nil { - return nil, fmt.Errorf("failed to rslave mount dst: %q, flags: %#x, err: %v", dst, flags, err) + return nil, fmt.Errorf("mount rslave dst: %q, flags: %#x, err: %v", dst, flags, err) } cpy := m @@ -146,7 +146,7 @@ func setupFS(spec *specs.Spec, conf *boot.Config, bundleDir string) ([]specs.Mou flags := uintptr(syscall.MS_BIND | syscall.MS_REMOUNT | syscall.MS_RDONLY | syscall.MS_REC) src := spec.Root.Path if err := syscall.Mount(src, src, "bind", flags, ""); err != nil { - return nil, fmt.Errorf("failed to remount root as read-only with source: %q, target: %q, flags: %#x, err: %v", spec.Root.Path, spec.Root.Path, flags, err) + return nil, fmt.Errorf("remounting root as read-only with source: %q, target: %q, flags: %#x, err: %v", spec.Root.Path, spec.Root.Path, flags, err) } } return rv, nil |