rbd: additional validation for striping parameters #6914
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
| @@ -772,11 +772,6 @@ int set_stripe_unit_count(cls_method_context_t hctx, bufferlist *in, bufferlist | |||
| CLS_ERR("failed to read the order off of disk: %s", cpp_strerror(r).c_str()); | |||
| return r; | |||
| } | |||
| if ((1ull << order) % stripe_unit || stripe_unit > (1ull << order)) { | |||
There was a problem hiding this comment.
We should keep this check too, since librbd will still use it when not called from /usr/bin/rbd
|
@jdurgin thanks, I have modified them |
stripe_unit is same to object size or stripe_count is equal to 1,the remainder for it is misleading. Signed-off-by: Na Xie <xie.na@h3c.com>
|
@dachary OK, it succeed |
| } else if ((stripe_unit || stripe_count) && | ||
| (stripe_unit != (1ull << order) && stripe_count != 1)) { | ||
| } else if (stripe_unit || stripe_count) { | ||
| if ((1ull << order) % stripe_unit || stripe_unit >= (1ull << order)) { |
There was a problem hiding this comment.
What if stripe_unit == 1 && stripe_unit == 0? Divide by zero would result.
if ((stripe_unit != 0 && stripe_count == 0) ||
(stripe_unit == 0 && stripe_count != 0)) {
std::cerr << "must specify both (or neither) of stripe-unit and stripe-count"
<< std::endl;
return -EINVAL;
} else if (stripe_unit || stripe_count) {
if ((1ull << order) % stripe_unit || stripe_unit >= (1ull << order)) {
std::cerr << "stripe unit is not a factor of the object size" << std::endl;
return -EINVAL;
}
if (stripe_count == 1) {
std::cerr << "stripe count not allowed to be 1" << std::endl;
return -EINVAL;
}
features |= RBD_FEATURE_STRIPINGV2;
} else {
features &= ~RBD_FEATURE_STRIPINGV2;
} |
|
Indeed -- it was cut off in the snippet. 👍 |
|
@dillaman |
dillaman
changed the title
dillaman
pushed a commit
that referenced
this pull request
Dec 18, 2015
rbd: additional validation for striping parameters Reviewed-by: Jason Dillaman <dillaman@redhat.com>
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.
stripe_unit is same to object size or stripe_count is equal to 1,the remainder for it is misleading.
checking for striping parameters should be as much as possible int the front of processing.
Signed-off-by: Na Xie xie.na@h3c.com