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

common: object_map_update fails with -EINVAL return code #5559

Merged
2 commits merged into from Aug 30, 2015
Merged

common: object_map_update fails with -EINVAL return code #5559

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
fca7876
common: bit_vector extent calculation incorrect for last page
Aug 10, 2015
153744d
tests: increase test coverage for partial encodes/decodes
Aug 10, 2015
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
5 changes: 4 additions & 1 deletion src/common/bit_vector.hpp
View file
Open in desktop
Expand Up @@ -261,7 +261,10 @@ void BitVector<_b>::get_data_extents(uint64_t offset, uint64_t length,
end_offset += (CEPH_PAGE_SIZE - (end_offset % CEPH_PAGE_SIZE));
assert(*byte_offset <= end_offset);

*byte_length = MIN(end_offset - *byte_offset, m_data.length());
*byte_length = end_offset - *byte_offset;
if (*byte_offset + *byte_length > m_data.length()) {
*byte_length = m_data.length() - *byte_offset;
}
}

template <uint8_t _b>
Expand Down
88 changes: 53 additions & 35 deletions src/test/common/test_bit_vector.cc
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@
#include <gtest/gtest.h>
#include <cmath>
#include "common/bit_vector.hpp"
#include <boost/assign/list_of.hpp>

using namespace ceph;

Expand Down Expand Up @@ -87,16 +88,17 @@ TYPED_TEST(BitVectorTest, get_set) {
TYPED_TEST(BitVectorTest, get_buffer_extents) {
typename TestFixture::bit_vector_t bit_vector;

uint64_t element_count = 2 * CEPH_PAGE_SIZE + 51;
uint64_t elements_per_byte = 8 / bit_vector.BIT_COUNT;
bit_vector.resize((2 * CEPH_PAGE_SIZE + 51) * elements_per_byte);
bit_vector.resize(element_count * elements_per_byte);

uint64_t offset = (CEPH_PAGE_SIZE + 11) * elements_per_byte;
uint64_t length = (CEPH_PAGE_SIZE + 31) * elements_per_byte;
uint64_t byte_offset;
uint64_t byte_length;
bit_vector.get_data_extents(offset, length, &byte_offset, &byte_length);
ASSERT_EQ(CEPH_PAGE_SIZE, byte_offset);
ASSERT_EQ(2 * CEPH_PAGE_SIZE, byte_length);
ASSERT_EQ(CEPH_PAGE_SIZE + (element_count % CEPH_PAGE_SIZE), byte_length);

bit_vector.get_data_extents(1, 1, &byte_offset, &byte_length);
ASSERT_EQ(0U, byte_offset);
Expand Down Expand Up @@ -128,7 +130,7 @@ TYPED_TEST(BitVectorTest, partial_decode_encode) {
typename TestFixture::bit_vector_t bit_vector;

uint64_t elements_per_byte = 8 / bit_vector.BIT_COUNT;
bit_vector.resize(5111 * elements_per_byte);
bit_vector.resize(9161 * elements_per_byte);
for (uint64_t i = 0; i < bit_vector.size(); ++i) {
bit_vector[i] = i % 4;
}
Expand All @@ -148,38 +150,54 @@ TYPED_TEST(BitVectorTest, partial_decode_encode) {
bufferlist::iterator footer_it = footer_bl.begin();
bit_vector.decode_footer(footer_it);

uint64_t byte_offset;
uint64_t byte_length;
bit_vector.get_data_extents(0, 1, &byte_offset, &byte_length);

bufferlist data_bl;
data_bl.substr_of(bl, bit_vector.get_header_length() + byte_offset,
byte_length);
bufferlist::iterator data_it = data_bl.begin();
bit_vector.decode_data(data_it, byte_offset);

bit_vector[0] = 3;

data_bl.clear();
bit_vector.encode_data(data_bl, byte_offset, byte_length);

footer_bl.clear();
bit_vector.encode_footer(footer_bl);

bufferlist updated_bl;
updated_bl.substr_of(bl, 0, bit_vector.get_header_length() + byte_offset);
updated_bl.append(data_bl);

uint64_t tail_data_offset = bit_vector.get_header_length() + byte_offset +
byte_length;
data_bl.substr_of(bl, tail_data_offset,
bit_vector.get_footer_offset() - tail_data_offset);
updated_bl.append(data_bl);
updated_bl.append(footer_bl);
ASSERT_EQ(bl.length(), updated_bl.length());

bufferlist::iterator updated_it = updated_bl.begin();
::decode(bit_vector, updated_it);
typedef std::pair<uint64_t, uint64_t> Extent;
typedef std::list<Extent> Extents;

Extents extents = boost::assign::list_of(
std::make_pair(0, 1))(
std::make_pair((CEPH_PAGE_SIZE * elements_per_byte) - 2, 4))(
std::make_pair((CEPH_PAGE_SIZE * elements_per_byte) + 2, 2))(
std::make_pair((2 * CEPH_PAGE_SIZE * elements_per_byte) - 2, 4))(
std::make_pair((2 * CEPH_PAGE_SIZE * elements_per_byte) + 2, 2))(
std::make_pair(2, 2 * CEPH_PAGE_SIZE));
for (Extents::iterator it = extents.begin(); it != extents.end(); ++it) {
uint64_t element_offset = it->first;
uint64_t element_length = it->second;
uint64_t byte_offset;
uint64_t byte_length;
bit_vector.get_data_extents(element_offset, element_length, &byte_offset,
&byte_length);

bufferlist data_bl;
data_bl.substr_of(bl, bit_vector.get_header_length() + byte_offset,
byte_length);
bufferlist::iterator data_it = data_bl.begin();
bit_vector.decode_data(data_it, byte_offset);

data_bl.clear();
bit_vector.encode_data(data_bl, byte_offset, byte_length);

footer_bl.clear();
bit_vector.encode_footer(footer_bl);

bufferlist updated_bl;
updated_bl.substr_of(bl, 0, bit_vector.get_header_length() + byte_offset);
updated_bl.append(data_bl);

if (byte_offset + byte_length < bit_vector.get_footer_offset()) {
uint64_t tail_data_offset = bit_vector.get_header_length() + byte_offset +
byte_length;
data_bl.substr_of(bl, tail_data_offset,
bit_vector.get_footer_offset() - tail_data_offset);
updated_bl.append(data_bl);
}

updated_bl.append(footer_bl);
ASSERT_EQ(bl, updated_bl);

bufferlist::iterator updated_it = updated_bl.begin();
::decode(bit_vector, updated_it);
}
}

TYPED_TEST(BitVectorTest, header_crc) {
Expand Down