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

ceph-dencoder: enable bluestore types #13595

Merged
merged 2 commits into from Feb 23, 2017
Merged

ceph-dencoder: enable bluestore types #13595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7c1d3b
os/bluestore: fix bluestore_blob_t::generate_test_instances()
tchaikov Feb 22, 2017
a3b8e0a
ceph-dencoder: s/WITH_LIBAIO/HAVE_LIBAIO/
tchaikov Feb 22, 2017
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
4 changes: 2 additions & 2 deletions src/os/bluestore/bluestore_types.cc
View file
Open in desktop
Expand Up @@ -630,12 +630,12 @@ void bluestore_blob_t::generate_test_instances(list<bluestore_blob_t*>& ls)
ls.push_back(new bluestore_blob_t);
ls.back()->init_csum(Checksummer::CSUM_XXHASH32, 16, 65536);
ls.back()->csum_data = buffer::claim_malloc(4, strdup("abcd"));
ls.back()->add_unused(0, 3);
ls.back()->add_unused(8, 8);
ls.back()->extents.emplace_back(bluestore_pextent_t(0x40100000, 0x10000));
ls.back()->extents.emplace_back(
bluestore_pextent_t(bluestore_pextent_t::INVALID_OFFSET, 0x1000));
ls.back()->extents.emplace_back(bluestore_pextent_t(0x40120000, 0x10000));
ls.back()->add_unused(0, 3);
ls.back()->add_unused(8, 8);
}

ostream& operator<<(ostream& out, const bluestore_blob_t& o)
Expand Down
10 changes: 7 additions & 3 deletions src/test/encoding/types.h
View file
Open in desktop
Expand Up @@ -116,14 +116,18 @@ TYPE(ObjectStore::Transaction)
#include "os/filestore/SequencerPosition.h"
TYPE(SequencerPosition)

#ifdef WITH_LIBAIO
#ifdef HAVE_LIBAIO
#include "os/bluestore/bluestore_types.h"
TYPE(bluestore_cnode_t)
TYPE(bluestore_compression_header_t)
TYPE(bluestore_extent_ref_map_t)
TYPE(bluestore_pextent_t)
TYPE(bluestore_blob_t)
TYPE(bluestore_lextent_t)
// TODO: bluestore_blob_t repurposes the "feature" param of encode() for its
// struct_v. at a higher level, BlueStore::ExtendMap encodes the extends using
// a different interface than the normal ones. see
// BlueStore::ExtentMap::encode_some(). maybe we can test it using another
// approach.
// TYPE_FEATUREFUL(bluestore_blob_t)
TYPE(bluestore_onode_t)
TYPE(bluestore_wal_op_t)
TYPE(bluestore_wal_transaction_t)
Expand Down