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

osd: bluestore: fix several bugs #7122

Merged
merged 17 commits into from Jan 14, 2016
Merged

Conversation

xiexingguo
Copy link
Member

No description provided.

@xiexingguo
Copy link
Member Author

@liewegas I find some more small fixes/cleanups through code inspection which might be helpful. Hope you wouldn't mind :-)

@liewegas
Copy link
Member

liewegas commented Jan 6, 2016

A few of the other patches are already cherry-picked into my wip-bluestore branch. Let's rebase this as soon as that merges

@liewegas
Copy link
Member

liewegas commented Jan 6, 2016

Thanks!

@liewegas
Copy link
Member

can you rebase this on current master please? thanks!

@xiexingguo
Copy link
Member Author

@liewegas Sure. Rebased and also drop the change that you still have doubt in.

@liewegas
Copy link
Member

@xiexingguo thanks, will run this though QA. Do you mind seeing which of these also need to be fixed in os/kstore/KStore.cc as well?

@liewegas
Copy link
Member

error: os/bluestore/BlueStore.cc:1346:1: jump to label ‘free_bluefs’ [-fpermissive]
free_bluefs:
^
error: os/bluestore/BlueStore.cc:1254:12: from here [-fpermissive]
goto free_bluefs;
^
error: os/bluestore/BlueStore.cc:1326:16: crosses initialization of ‘std::stringstream err’
stringstream err;
^
error: os/bluestore/BlueStore.cc:1322:10: crosses initialization of ‘std::string options’
string options;
^
error: os/bluestore/BlueStore.cc:1346:1: jump to label ‘free_bluefs’ [-fpermissive]
free_bluefs:
^
error: os/bluestore/BlueStore.cc:1229:14: from here [-fpermissive]
goto free_bluefs;

and other errors

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Fixes: ceph#14259
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Fixes: ceph#14260
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Fixes: ceph#14261
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Fixes: ceph#14353
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
For the sake of performance.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
For the sake of performance.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
@xiexingguo
Copy link
Member Author

@liewegas My apology for the mindlessness. I have done compiling locally and three more commits are appended to this PR for killing warnings and saving performance a little bit. The updated commits are as below(as you may concern about):
xiexingguo@a0112a2171a47cbb6d0f5b858f51728f785798e6(It is this one that causes noise from compiler)
xiexingguo@d3395549e8273922b3f30856d3b4540ef8c27413(kill warnings)
xiexingguo@c8aae0c10847072da45c8b065a4ca1734be0bb29(decrease list number from 5 to 1 if we try to check whether or not a coll is empty)
xiexingguo@a987fc3a377f6cd8c25cfebdb18eec43815dfc50(same as above)

And you may need to remerge this PR and run the test again.

BTW, when shall the i-Bot be ready to work again? I do miss him:-)

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
liewegas added a commit that referenced this pull request Jan 14, 2016
osd: bluestore: fix several bugs

Reviewed-by: Sage Weil <sage@redhat.com>
@liewegas liewegas merged commit 852f076 into ceph:master Jan 14, 2016
@xiexingguo xiexingguo deleted the xxg-wip-bluefs branch January 16, 2016 10:43
@ghost ghost changed the title os: batch fixes to bluestore osd: bluestore: fix several bugs Feb 10, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants