(daemon/graphdriver/zfs) Fixes #43080 #48520
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ffaaae8
to
2189e47
Compare
greut
reviewed
Sep 18, 2024
daemon/graphdriver/zfs/zfs.go
Outdated
| @@ -361,6 +361,11 @@ func (d *Driver) Remove(id string) error { | |||
| name := d.zfsPath(id) | |||
| dataset := zfs.Dataset{Name: name} | |||
| err := dataset.Destroy(zfs.DestroyRecursive) | |||
| if err != nil && strings.Contains(fmt.Sprint(err), "dataset does not exist") { | |||
There was a problem hiding this comment.
you may probably do a stricter check.
errZfs, ok := err.(zfs.Error)
if ok && errZfs.Stderr == "dataset does not exist" {
...
}or go with err.Error() instead of fmt.Sprint(err), see https://pkg.go.dev/builtin@go1.23.1#error
Happy Go hacking mate!
There was a problem hiding this comment.
Done. Unfortunately, the stderr field contains the whole output of the zfs command
Stderr: "cannot open 'rpool/zzztest/doesnotexist': dataset does not exist\n",
AkihiroSuda
reviewed
Sep 18, 2024
daemon/graphdriver/zfs/zfs.go
Outdated
| errZfs, isZfsError := err.(*zfs.Error) | ||
| if isZfsError && strings.HasSuffix(errZfs.Stderr, "dataset does not exist\n") { | ||
| logger := log.G(context.TODO()).WithField("storage-driver", "zfs") | ||
| logger.Warnf("Tried to destroy inexistant dataset %s", name) |
There was a problem hiding this comment.
Suggested change
| logger.Warnf("Tried to destroy inexistant dataset %s", name) | |
| logger.WithError(err).Warnf("Tried to destroy inexistant dataset %q", name) |
Ignore "dataset does not exist" error in Remove function Signed-off-by: François Scala <github@arcenik.net>
b402bed
to
12431a9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #43080
- What I did
I updated the Remove function to ignore the "dataset does not exist" error
- How I did it
Doing a strings.Contains of "dataset does not exist" in err
- How to verify it
- Description for the changelog
Ignores "dataset does not exist" error when removing dataset on ZFS (#43080)