Skip to content

tolerate invalid cni caches for deletion #1072

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
squeed merged 1 commit into from
Mar 12, 2024
Merged

tolerate invalid cni caches for deletion #1072

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
11 changes: 7 additions & 4 deletions libcni/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,9 +586,9 @@ func (c *CNIConfig) DelNetworkList(ctx context.Context, list *NetworkConfigList,
if gtet, err := version.GreaterThanOrEqualTo(list.CNIVersion, "0.4.0"); err != nil {
return err
} else if gtet {
cachedResult, err = c.getCachedResult(list.Name, list.CNIVersion, rt)
if err != nil {
return fmt.Errorf("failed to get network %q cached result: %w", list.Name, err)
if cachedResult, err = c.getCachedResult(list.Name, list.CNIVersion, rt); err != nil {
_ = c.cacheDel(list.Name, rt)
cachedResult = nil
}
}

Expand All @@ -598,7 +598,10 @@ func (c *CNIConfig) DelNetworkList(ctx context.Context, list *NetworkConfigList,
return fmt.Errorf("plugin %s failed (delete): %w", pluginDescription(net.Network), err)
}
}
_ = c.cacheDel(list.Name, rt)

if cachedResult != nil {
_ = c.cacheDel(list.Name, rt)
}

return nil
}
Expand Down
4 changes: 2 additions & 2 deletions libcni/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1474,15 +1474,15 @@ var _ = Describe("Invoking plugins", func() {
})

Context("when the cached result is invalid", func() {
It("returns an error", func() {
It("tolerates the error", func() {
cacheFile := resultCacheFilePath(cacheDirPath, netConfigList.Name, runtimeConfig)
err := os.MkdirAll(filepath.Dir(cacheFile), 0o700)
Expect(err).NotTo(HaveOccurred())
err = os.WriteFile(cacheFile, []byte("adfadsfasdfasfdsafaf"), 0o600)
Expect(err).NotTo(HaveOccurred())

err = cniConfig.DelNetworkList(ctx, netConfigList, runtimeConfig)
Expect(err).To(MatchError("failed to get network \"some-list\" cached result: decoding version from network config: invalid character 'a' looking for beginning of value"))
Expect(err).NotTo(HaveOccurred())
})
})
})
Expand Down