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

os/bluestore: cleanup min_alloc_size; some formatting nits #15826

Merged
merged 5 commits into from Jun 25, 2017

Conversation

Projects
None yet
3 participants
@xiexingguo
Copy link
Member

xiexingguo commented Jun 22, 2017

No description provided.

@xiexingguo xiexingguo requested review from liewegas and ifed01 Jun 22, 2017

@xiexingguo xiexingguo force-pushed the xiexingguo:wip-bluestore-20170622 branch 2 times, most recently from 8447a44 to 8840481 Jun 22, 2017

xiexingguo added some commits Jun 22, 2017

os/bluestore: prefix open_statfs with "_"
As it is an internal method only.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
os/bluestore: drop _open_alloc() from mkfs
This is useless as the fsck() process will do necessary validations later.
And dropping this can make mkfs slightly faster.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

@xiexingguo xiexingguo force-pushed the xiexingguo:wip-bluestore-20170622 branch from b4f0498 to 4d9c978 Jun 22, 2017

@@ -3981,9 +3981,6 @@ int BlueStore::_check_or_set_bdev_label(

void BlueStore::_set_alloc_sizes(void)
{
min_alloc_size_order = ctz(min_alloc_size);
assert(min_alloc_size == 1u << min_alloc_size_order);

This comment has been minimized.

@ifed01

ifed01 Jun 22, 2017

Contributor

may be move after min_alloc_size_order assignment?

This comment has been minimized.

@xiexingguo

xiexingguo Jun 22, 2017

Author Member

ah, right. Thanks!

xiexingguo added some commits Jun 22, 2017

os/bluestore: non-atomic min_alloc_size_order
This is not necessary because we now write min_alloc_size into disk
during mkfs.

There are two acaccompanying changes too:
(1) don't call _set_alloc_sizes() during mkfs() any more, which is
not necessary.
(2) don't update min_alloc_size during _set_alloc_sizes(), we instead
update min_alloc_size_order each time we successfully read min_alloc_size
from disk.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
os/bluestore: add "0x" prefix for hex outputs
Which is the normal case.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
os/bluestore: avoid initializing finishers in constructor
This is a follow up change of #15666,
which I forget to update.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

@xiexingguo xiexingguo force-pushed the xiexingguo:wip-bluestore-20170622 branch from 4d9c978 to aa850b9 Jun 22, 2017

@xiexingguo

This comment has been minimized.

Copy link
Member Author

xiexingguo commented Jun 22, 2017

changelog:

  • sanity check min_alloc_size_order & min_alloc_size
@ifed01

ifed01 approved these changes Jun 22, 2017

@liewegas liewegas merged commit c340b71 into ceph:master Jun 25, 2017

3 of 4 checks passed

make check make check failed
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
arm64 make check arm64 make check succeeded
Details

@xiexingguo xiexingguo deleted the xiexingguo:wip-bluestore-20170622 branch Jun 25, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment