RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

os/bluestore: behave if we *do* set PGMETA and PERPOOL flags

Browse Source 
pgmeta trumps perpool.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-08-05 12:53:29 -05:00
parent 9bbe8d04c7
commit 52a2d4b24d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/os/bluestore/BlueStore.cc
View File

@ -3287,7 +3287,7 @@ const string& BlueStore::Onode::get_omap_prefix()
void BlueStore::Onode::get_omap_header(string *out)
{
if (onode.is_perpool_omap()) {
if (onode.is_perpool_omap() && !onode.is_pgmeta_omap()) {
_key_encode_u64(oid.hobj.pool, out);
}
_key_encode_u64(onode.nid, out);
@ -3296,7 +3296,7 @@ void BlueStore::Onode::get_omap_header(string *out)
void BlueStore::Onode::get_omap_key(const string& key, string *out)
{
if (onode.is_perpool_omap()) {
if (onode.is_perpool_omap() && !onode.is_pgmeta_omap()) {
_key_encode_u64(oid.hobj.pool, out);
}
_key_encode_u64(onode.nid, out);
@ -3306,7 +3306,7 @@ void BlueStore::Onode::get_omap_key(const string& key, string *out)
void BlueStore::Onode::rewrite_omap_key(const string& old, string *out)
{
if (onode.is_perpool_omap()) {
if (onode.is_perpool_omap() && !onode.is_pgmeta_omap()) {
_key_encode_u64(oid.hobj.pool, out);
}
_key_encode_u64(onode.nid, out);
@ -3315,7 +3315,7 @@ void BlueStore::Onode::rewrite_omap_key(const string& old, string *out)
void BlueStore::Onode::get_omap_tail(string *out)
{
if (onode.is_perpool_omap()) {
if (onode.is_perpool_omap() && !onode.is_pgmeta_omap()) {
_key_encode_u64(oid.hobj.pool, out);
}
_key_encode_u64(onode.nid, out);
@ -3324,7 +3324,7 @@ void BlueStore::Onode::get_omap_tail(string *out)
void BlueStore::Onode::decode_omap_key(const string& key, string *user_key)
{
if (onode.is_perpool_omap()) {
if (onode.is_perpool_omap() && !onode.is_pgmeta_omap()) {
*user_key = key.substr(sizeof(uint64_t)*2 + 1);
} else {
*user_key = key.substr(sizeof(uint64_t) + 1);