Skip to content
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.

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

rbd: rbd order will be place in 22, when set to 0 in the config_opt #6886

Merged
merged 3 commits into from Jan 6, 2016
Merged

rbd: rbd order will be place in 22, when set to 0 in the config_opt #6886

merged 3 commits into from Jan 6, 2016

Conversation

renhwztetecs
Copy link
Contributor

rbd: rbd order will be place in 22, when set to 0 in the config_opt

Fixes: #14047
Signed-off-by: huanwen ren ren.huanwen@zte.com.cn

@ghost
Copy link

ghost commented Dec 10, 2015

@renhwztetecs please ignore the bot failure, it is a false negative ( see http://tracker.ceph.com/issues/13986 for more information). You can reschedule a run by rebasing and repushing.

@ghost ghost added the rbd label Dec 10, 2015
@jdurgin
Copy link
Member

jdurgin commented Dec 10, 2015

This looks good, but needs to modify the defaults test: https://github.com/ceph/ceph/blob/master/src/test/pybind/test_rbd.py#L170

Delete rbd'order = RBD_DEFAULT_OBJ_ORDER process, when rbd'order is set to zero

Fixes: #14047
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
Delete rbd'order define

Fixes: #14047
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
@dillaman
Copy link

@renhwztetecs Did you not need to modify the test @jdurgin pointed out?

@renhwztetecs
Copy link
Contributor Author

@dillaman
I will try to modify the test
Thank you

@renhwztetecs
Copy link
Contributor Author

@dillaman @jdurgin
I have modified the test, Please have a look at:
#6995

@dillaman
Copy link

@renhwztetecs Can you just append that commit to this PR instead of opening a new PR?

@renhwztetecs
Copy link
Contributor Author

@dillaman
Oh, I have already,The test is not to mention alone?

@dillaman
Copy link

I recommend that you git cherry-pick bea6a0a1b349f21ce70868f31ce02372d1820cb0 into the ssssztes:renhw-wip-14047 branch and repush so it is part of this PR.

@jdurgin
Copy link
Member

jdurgin commented Dec 23, 2015

While you're at it, can you set the git author field too? configure it via:

git config --global user.name "huanwen ren"
git config --global user.email "ren.huanwen@zte.com.cn"

With this configuration, whenever you 'git commit -s' your signed-off-by line will be automatically added to the commit message.

To change the author of your existing commits, ``git rebase -i HEAD~3` (assuming there are 3 commits you want to change), select e to edit for each commit to change, and for each commit run

git commit --amend --author "huanwen ren <ren.huanwen@zte.com.cn>"
git rebase --continue

@renhwztetecs
Copy link
Contributor Author

@ jdurgin
Many thanks for your kind help

@renhwztetecs
Copy link
Contributor Author

@dillaman
I have put the test into the PR
thank for you recommend

delete rbd'order = RBD_DEFAULT_OBJ_ORDER process, when rbd'order is set to zero
so,delete the default order of RBD in test_rbd.py

Fixes: #14139
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
jdurgin added a commit that referenced this pull request Jan 6, 2016
rbd: rbd order will be place in 22, when set to 0 in the config_opt

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
@jdurgin jdurgin merged commit 2247c63 into ceph:master Jan 6, 2016
@jdurgin
Copy link
Member

jdurgin commented Jan 6, 2016

looks good, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants