Skip to content

Commit 3ab4fa1

Browse files
committed
remove
1 parent 7fb43fc commit 3ab4fa1

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

network/cni/cni.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,10 @@ func (c *CNI) deleteVM(ctx context.Context, vmID string) error {
146146
}
147147
}
148148

149-
// Remove the named netns bind-mount. Kernel destroys the netns and all
150-
// its devices (bridge, tap, veth-vm) when the last reference drops.
151-
if err := os.Remove(nsPath); err != nil && !os.IsNotExist(err) {
149+
// Remove the named netns (unmount bind-mount + remove file).
150+
// deleteNetns retries briefly to handle async fd cleanup after process kill.
151+
nsName := c.conf.CNINetnsName(vmID)
152+
if err := deleteNetns(nsName); err != nil && !os.IsNotExist(err) {
152153
return fmt.Errorf("remove netns %s: %w", nsPath, err)
153154
}
154155

0 commit comments

Comments
 (0)