summaryrefslogtreecommitdiffhomepage
path: root/runsc/cmd/kill.go
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2020-12-17 10:44:44 -0800
committergVisor bot <gvisor-bot@google.com>2020-12-17 10:52:44 -0800
commit8ea19b5818d0c1e9b798bd0bd288c7f51a46261d (patch)
treed7f9da9c969f460fc6267e6fe212e37bfdf12185 /runsc/cmd/kill.go
parente7493a9e23325c00ad9a0db341d5887afe3ae5eb (diff)
Add sandbox ID to state file name
This allows to find all containers inside a sandbox more efficiently. This operation is required every time a container starts and stops, and previously required loading *all* container state files to check whether the container belonged to the sandbox. Apert from being inneficient, it has caused problems when state files are stale or corrupt, causing inavalability to create any container. Also adjust commands `list` and `debug` to skip over files that fail to load. Resolves #5052 PiperOrigin-RevId: 348050637
Diffstat (limited to 'runsc/cmd/kill.go')
-rw-r--r--runsc/cmd/kill.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/runsc/cmd/kill.go b/runsc/cmd/kill.go
index fe69e2a08..aecf0b7ab 100644
--- a/runsc/cmd/kill.go
+++ b/runsc/cmd/kill.go
@@ -69,7 +69,7 @@ func (k *Kill) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
Fatalf("it is invalid to specify both --all and --pid")
}
- c, err := container.LoadAndCheck(conf.RootDir, id)
+ c, err := container.Load(conf.RootDir, container.FullID{ContainerID: id}, container.LoadOpts{})
if err != nil {
Fatalf("loading container: %v", err)
}