From 6b10870c1a2a934d70a36fcab55a5b96a704dd1c Mon Sep 17 00:00:00 2001 From: apostasie Date: Mon, 13 May 2024 00:26:08 -0700 Subject: [PATCH] Re-acquire name in onStartContainer (see #2992) Signed-off-by: apostasie --- pkg/ocihook/ocihook.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/ocihook/ocihook.go b/pkg/ocihook/ocihook.go index bed57eefb8c..a3936b48462 100644 --- a/pkg/ocihook/ocihook.go +++ b/pkg/ocihook/ocihook.go @@ -477,6 +477,15 @@ func onCreateRuntime(opts *handlerOpts) error { } func onStartContainer(opts *handlerOpts) error { + name := opts.state.Annotations[labels.Name] + ns := opts.state.Annotations[labels.Namespace] + namst, err := namestore.New(opts.dataStore, ns) + if err != nil { + log.L.WithError(err).Error("failed opening the namestore in onStartContainer") + } else if err := namst.Acquire(name, opts.state.ID); err != nil { + log.L.WithError(err).Error("failed re-acquiring name - see https://github.com/containerd/nerdctl/issues/2992") + } + if opts.cni != nil { return applyNetworkSettings(opts) }