file: ignore exit code 22 when addding datapool #12725
Merged
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
travisn
requested changes
Aug 15, 2023
pkg/daemon/ceph/client/filesystem.go
Outdated
| @@ -168,6 +169,10 @@ func AddDataPoolToFilesystem(context *clusterd.Context, clusterInfo *ClusterInfo | |||
| args := []string{"fs", "add_data_pool", name, poolName} | |||
| _, err := NewCephCommand(context, clusterInfo, args).Run() | |||
| if err != nil { | |||
| // TODO: remove this once https://github.com/rook/rook/issues/12673 is fixed. | |||
There was a problem hiding this comment.
This is the expected error from Reef, not sure we'll have any other fix than this.
Suggested change
| // TODO: remove this once https://github.com/rook/rook/issues/12673 is fixed. | |
| // Reef disallows calling add_data_pool for a pool that has already been added, so ignore the error code. | |
| // Previous releases do not return an error when an existing data pool is added. |
pkg/daemon/ceph/client/filesystem.go
Outdated
| @@ -168,6 +169,10 @@ func AddDataPoolToFilesystem(context *clusterd.Context, clusterInfo *ClusterInfo | |||
| args := []string{"fs", "add_data_pool", name, poolName} | |||
| _, err := NewCephCommand(context, clusterInfo, args).Run() | |||
| if err != nil { | |||
| // TODO: remove this once https://github.com/rook/rook/issues/12673 is fixed. | |||
| if code, ok := exec.ExitStatus(err); ok && code == int(syscall.EINVAL) { | |||
There was a problem hiding this comment.
Let's only ignore this code for Reef: if clusterInfo.CephVersion.IsAtLeastReef()
Ignore the exit code 22 when adding the datapool to a filesystem. updates: rook#12673 Signed-off-by: Madhu Rajanna <[email protected]>
travisn
approved these changes
Aug 15, 2023
travisn
added a commit
that referenced
this pull request
Aug 15, 2023
file: ignore exit code 22 when addding datapool (backport #12725)
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.
Description of your changes:
Ignore the exit code 22 when adding the datapool to a filesystem.
Which issue is resolved by this Pull Request:
Resolves: #12673
Checklist:
skip-cion the PR.