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.

Sign up for GitHub

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

Jump to bottom

os/bluestore: invoke _prepare_ondisk_format_super as the last op #34616

Merged
merged 1 commit into from Apr 29, 2020
Merged

os/bluestore: invoke _prepare_ondisk_format_super as the last op #34616

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/os/bluestore/BlueStore.cc
View file
Open in desktop
Expand Up @@ -11060,14 +11060,14 @@ int BlueStore::_upgrade_super()
ceph_assert(ondisk_format > 0);
ceph_assert(ondisk_format < latest_ondisk_format);

KeyValueDB::Transaction t = db->get_transaction();
if (ondisk_format == 1) {
// changes:
// - super: added ondisk_format
// - super: added min_readable_ondisk_format
// - super: added min_compat_ondisk_format
// - super: added min_alloc_size
// - super: removed min_min_alloc_size
KeyValueDB::Transaction t = db->get_transaction();
{
bufferlist bl;
db->get(PREFIX_SUPER, "min_min_alloc_size", &bl);
Expand All @@ -11084,9 +11084,6 @@ int BlueStore::_upgrade_super()
t->rmkey(PREFIX_SUPER, "min_min_alloc_size");
}
ondisk_format = 2;
_prepare_ondisk_format_super(t);
int r = db->submit_transaction_sync(t);
ceph_assert(r == 0);
}
if (ondisk_format == 2) {
// changes:
Expand All @@ -11096,19 +11093,18 @@ int BlueStore::_upgrade_super()
// - super: added per_pool_omap key, which indicates that *all* objects
// are using the new prefix and key format
ondisk_format = 3;
KeyValueDB::Transaction t = db->get_transaction();
_prepare_ondisk_format_super(t);
int r = db->submit_transaction_sync(t);
ceph_assert(r == 0);
}
if (ondisk_format == 3) {
// changes:
// - FreelistManager keeps meta within bdev label
int r = _write_out_fm_meta(0);
ceph_assert(r == 0);

ondisk_format = 4;
}
// This to be the last operation
_prepare_ondisk_format_super(t);
int r = db->submit_transaction_sync(t);
ceph_assert(r == 0);
}
// done
dout(1) << __func__ << " done" << dendl;
Expand Down