Merge pull request #13595 from tchaikov/wip-enable-bluestore-ceph-dencoder

ceph-dencoder: enable bluestore types

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-02-23 09:31:58 -06:00 committed by GitHub
commit 8ff8f0fa0b
2 changed files with 9 additions and 5 deletions

View File

@ -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)

View File

@ -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)