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

rbd-mirror: lock loss during sync should wait for in-flight copies #15532

Merged
merged 2 commits into from Jun 8, 2017
Merged

rbd-mirror: lock loss during sync should wait for in-flight copies #15532

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
02f9ea4
rbd-mirror: partial revert of 649b29d
Jun 7, 2017
21d1932
rbd-mirror: narrowed scope of exclusive lock op tracking
Jun 7, 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
51 changes: 0 additions & 51 deletions src/test/rbd_mirror/image_sync/test_mock_ImageCopyRequest.cc
View file
Open in desktop
Expand Up @@ -87,7 +87,6 @@ using ::testing::_;
using ::testing::InSequence;
using ::testing::Invoke;
using ::testing::Return;
using ::testing::ReturnNew;
using ::testing::WithArg;
using ::testing::InvokeWithoutArgs;

Expand All @@ -107,11 +106,6 @@ class TestMockImageSyncImageCopyRequest : public TestMockFixture {
ASSERT_EQ(0, open_image(m_local_io_ctx, m_image_name, &m_local_image_ctx));
}

void expect_start_op(librbd::MockExclusiveLock &mock_exclusive_lock) {
EXPECT_CALL(mock_exclusive_lock, start_op()).WillOnce(
ReturnNew<FunctionContext>([](int) {}));
}

void expect_get_snap_id(librbd::MockTestImageCtx &mock_image_ctx) {
EXPECT_CALL(mock_image_ctx, get_snap_id(_, _))
.WillRepeatedly(Invoke([&mock_image_ctx](cls::rbd::SnapshotNamespace snap_namespace,
Expand Down Expand Up @@ -222,16 +216,12 @@ TEST_F(TestMockImageSyncImageCopyRequest, SimpleImage) {
journal::MockJournaler mock_journaler;
MockObjectCopyRequest mock_object_copy_request;

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

expect_get_snap_id(mock_remote_image_ctx);

InSequence seq;
expect_get_object_count(mock_remote_image_ctx, 1);
expect_get_object_count(mock_remote_image_ctx, 0);
expect_update_client(mock_journaler, 0);
expect_start_op(mock_exclusive_lock);
expect_object_copy_send(mock_object_copy_request);
expect_update_client(mock_journaler, 0);

Expand Down Expand Up @@ -273,16 +263,11 @@ TEST_F(TestMockImageSyncImageCopyRequest, Throttled) {
journal::MockJournaler mock_journaler;
MockObjectCopyRequest mock_object_copy_request;

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

expect_get_snap_id(mock_remote_image_ctx);

expect_get_object_count(mock_remote_image_ctx, object_count);
expect_get_object_count(mock_remote_image_ctx, 0);

EXPECT_CALL(mock_exclusive_lock, start_op())
.Times(object_count).WillRepeatedly(ReturnNew<FunctionContext>([](int) {}));
EXPECT_CALL(mock_object_copy_request, send()).Times(object_count);

boost::optional<uint64_t> expected_object_number(boost::none);
Expand Down Expand Up @@ -341,9 +326,6 @@ TEST_F(TestMockImageSyncImageCopyRequest, SnapshotSubset) {
journal::MockJournaler mock_journaler;
MockObjectCopyRequest mock_object_copy_request;

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

expect_get_snap_id(mock_remote_image_ctx);

InSequence seq;
Expand All @@ -352,7 +334,6 @@ TEST_F(TestMockImageSyncImageCopyRequest, SnapshotSubset) {
expect_get_object_count(mock_remote_image_ctx, 1);
expect_get_object_count(mock_remote_image_ctx, 1);
expect_update_client(mock_journaler, 0);
expect_start_op(mock_exclusive_lock);
expect_object_copy_send(mock_object_copy_request);
expect_update_client(mock_journaler, 0);

Expand Down Expand Up @@ -383,17 +364,13 @@ TEST_F(TestMockImageSyncImageCopyRequest, RestartCatchup) {
journal::MockJournaler mock_journaler;
MockObjectCopyRequest mock_object_copy_request;

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

expect_get_snap_id(mock_remote_image_ctx);

InSequence seq;
expect_get_object_count(mock_remote_image_ctx, 1);
expect_get_object_count(mock_remote_image_ctx, 0);
expect_get_object_count(mock_remote_image_ctx, 0);
expect_update_client(mock_journaler, 0);
expect_start_op(mock_exclusive_lock);
expect_object_copy_send(mock_object_copy_request);
expect_update_client(mock_journaler, 0);

Expand Down Expand Up @@ -421,16 +398,12 @@ TEST_F(TestMockImageSyncImageCopyRequest, RestartPartialSync) {
journal::MockJournaler mock_journaler;
MockObjectCopyRequest mock_object_copy_request;

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

expect_get_snap_id(mock_remote_image_ctx);

InSequence seq;
expect_get_object_count(mock_remote_image_ctx, 1);
expect_get_object_count(mock_remote_image_ctx, 2);
expect_update_client(mock_journaler, 0);
expect_start_op(mock_exclusive_lock);
expect_object_copy_send(mock_object_copy_request);
expect_update_client(mock_journaler, 0);

Expand Down Expand Up @@ -462,16 +435,12 @@ TEST_F(TestMockImageSyncImageCopyRequest, Cancel) {
journal::MockJournaler mock_journaler;
MockObjectCopyRequest mock_object_copy_request;

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

expect_get_snap_id(mock_remote_image_ctx);

InSequence seq;
expect_get_object_count(mock_remote_image_ctx, 2);
expect_get_object_count(mock_remote_image_ctx, 2);
expect_update_client(mock_journaler, 0);
expect_start_op(mock_exclusive_lock);
expect_object_copy_send(mock_object_copy_request);

C_SaferCond ctx;
Expand Down Expand Up @@ -512,16 +481,11 @@ TEST_F(TestMockImageSyncImageCopyRequest, Cancel_Inflight_Sync) {
journal::MockJournaler mock_journaler;
MockObjectCopyRequest mock_object_copy_request;

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

expect_get_snap_id(mock_remote_image_ctx);

expect_get_object_count(mock_remote_image_ctx, 10);
expect_get_object_count(mock_remote_image_ctx, 0);

EXPECT_CALL(mock_exclusive_lock, start_op())
.Times(6).WillRepeatedly(ReturnNew<FunctionContext>([](int) {}));
EXPECT_CALL(mock_object_copy_request, send()).Times(6);

EXPECT_CALL(mock_journaler, update_client(_, _))
Expand Down Expand Up @@ -565,9 +529,6 @@ TEST_F(TestMockImageSyncImageCopyRequest, Cancel1) {
journal::MockJournaler mock_journaler;
MockObjectCopyRequest mock_object_copy_request;

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

C_SaferCond ctx;
MockImageCopyRequest *request = create_request(mock_remote_image_ctx,
mock_local_image_ctx,
Expand Down Expand Up @@ -598,9 +559,6 @@ TEST_F(TestMockImageSyncImageCopyRequest, MissingSnap) {
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
journal::MockJournaler mock_journaler;

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

expect_get_snap_id(mock_remote_image_ctx);

C_SaferCond ctx;
Expand All @@ -624,9 +582,6 @@ TEST_F(TestMockImageSyncImageCopyRequest, MissingFromSnap) {
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
journal::MockJournaler mock_journaler;

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

expect_get_snap_id(mock_remote_image_ctx);

C_SaferCond ctx;
Expand All @@ -652,9 +607,6 @@ TEST_F(TestMockImageSyncImageCopyRequest, EmptySnapMap) {
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
journal::MockJournaler mock_journaler;

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

expect_get_snap_id(mock_remote_image_ctx);

C_SaferCond ctx;
Expand All @@ -680,9 +632,6 @@ TEST_F(TestMockImageSyncImageCopyRequest, EmptySnapSeqs) {
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
journal::MockJournaler mock_journaler;

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

expect_get_snap_id(mock_remote_image_ctx);

C_SaferCond ctx;
Expand Down
53 changes: 52 additions & 1 deletion src/test/rbd_mirror/image_sync/test_mock_ObjectCopyRequest.cc
View file
Open in desktop
Expand Up @@ -46,6 +46,7 @@ using ::testing::DoDefault;
using ::testing::InSequence;
using ::testing::Invoke;
using ::testing::Return;
using ::testing::ReturnNew;
using ::testing::WithArg;

namespace {
Expand Down Expand Up @@ -88,6 +89,11 @@ class TestMockImageSyncObjectCopyRequest : public TestMockFixture {
ASSERT_EQ(0, open_image(m_local_io_ctx, m_image_name, &m_local_image_ctx));
}

void expect_start_op(librbd::MockExclusiveLock &mock_exclusive_lock) {
EXPECT_CALL(mock_exclusive_lock, start_op()).WillOnce(
ReturnNew<FunctionContext>([](int) {}));
}

void expect_list_snaps(librbd::MockTestImageCtx &mock_image_ctx,
librados::MockTestMemIoCtxImpl &mock_io_ctx,
const librados::snap_set_t &snap_set) {
Expand Down Expand Up @@ -346,9 +352,11 @@ TEST_F(TestMockImageSyncObjectCopyRequest, DNE) {
librbd::MockTestImageCtx mock_remote_image_ctx(*m_remote_image_ctx);
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

librbd::MockObjectMap mock_object_map;
mock_local_image_ctx.object_map = &mock_object_map;

expect_test_features(mock_local_image_ctx);

C_SaferCond ctx;
Expand All @@ -374,6 +382,9 @@ TEST_F(TestMockImageSyncObjectCopyRequest, Write) {
librbd::MockTestImageCtx mock_remote_image_ctx(*m_remote_image_ctx);
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

librbd::MockObjectMap mock_object_map;
mock_local_image_ctx.object_map = &mock_object_map;

Expand All @@ -392,7 +403,9 @@ TEST_F(TestMockImageSyncObjectCopyRequest, Write) {
expect_list_snaps(mock_remote_image_ctx, mock_remote_io_ctx, 0);
expect_set_snap_read(mock_remote_io_ctx, m_remote_snap_ids[0]);
expect_sparse_read(mock_remote_io_ctx, 0, one.range_end(), 0);
expect_start_op(mock_exclusive_lock);
expect_write(mock_local_io_ctx, 0, one.range_end(), {0, {}}, 0);
expect_start_op(mock_exclusive_lock);
expect_update_object_map(mock_local_image_ctx, mock_object_map,
m_local_snap_ids[0], OBJECT_EXISTS, 0);

Expand All @@ -414,6 +427,9 @@ TEST_F(TestMockImageSyncObjectCopyRequest, ReadMissingStaleSnapSet) {
librbd::MockTestImageCtx mock_remote_image_ctx(*m_remote_image_ctx);
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

librbd::MockObjectMap mock_object_map;
mock_local_image_ctx.object_map = &mock_object_map;

Expand Down Expand Up @@ -449,12 +465,15 @@ TEST_F(TestMockImageSyncObjectCopyRequest, ReadMissingStaleSnapSet) {
expect_list_snaps(mock_remote_image_ctx, mock_remote_io_ctx, 0);
expect_set_snap_read(mock_remote_io_ctx, m_remote_snap_ids[3]);
expect_sparse_read(mock_remote_io_ctx, 0, one.range_end(), 0);
expect_start_op(mock_exclusive_lock);
expect_write(mock_local_io_ctx, 0, one.range_end(),
{m_local_snap_ids[1], {m_local_snap_ids[1],
m_local_snap_ids[0]}},
0);
expect_start_op(mock_exclusive_lock);
expect_update_object_map(mock_local_image_ctx, mock_object_map,
m_local_snap_ids[2], OBJECT_EXISTS, 0);
expect_start_op(mock_exclusive_lock);
expect_update_object_map(mock_local_image_ctx, mock_object_map,
m_local_snap_ids[3], OBJECT_EXISTS_CLEAN, 0);

Expand All @@ -472,6 +491,9 @@ TEST_F(TestMockImageSyncObjectCopyRequest, ReadMissingUpToDateSnapMap) {
librbd::MockTestImageCtx mock_remote_image_ctx(*m_remote_image_ctx);
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

librbd::MockObjectMap mock_object_map;
mock_local_image_ctx.object_map = &mock_object_map;

Expand Down Expand Up @@ -503,6 +525,9 @@ TEST_F(TestMockImageSyncObjectCopyRequest, ReadError) {
librbd::MockTestImageCtx mock_remote_image_ctx(*m_remote_image_ctx);
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

librbd::MockObjectMap mock_object_map;
mock_local_image_ctx.object_map = &mock_object_map;

Expand Down Expand Up @@ -533,6 +558,9 @@ TEST_F(TestMockImageSyncObjectCopyRequest, WriteError) {
librbd::MockTestImageCtx mock_remote_image_ctx(*m_remote_image_ctx);
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

librbd::MockObjectMap mock_object_map;
mock_local_image_ctx.object_map = &mock_object_map;

Expand All @@ -551,6 +579,7 @@ TEST_F(TestMockImageSyncObjectCopyRequest, WriteError) {
expect_list_snaps(mock_remote_image_ctx, mock_remote_io_ctx, 0);
expect_set_snap_read(mock_remote_io_ctx, m_remote_snap_ids[0]);
expect_sparse_read(mock_remote_io_ctx, 0, one.range_end(), 0);
expect_start_op(mock_exclusive_lock);
expect_write(mock_local_io_ctx, 0, one.range_end(), {0, {}}, -EINVAL);

request->send();
Expand All @@ -577,6 +606,9 @@ TEST_F(TestMockImageSyncObjectCopyRequest, WriteSnaps) {
librbd::MockTestImageCtx mock_remote_image_ctx(*m_remote_image_ctx);
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

librbd::MockObjectMap mock_object_map;
mock_local_image_ctx.object_map = &mock_object_map;

Expand All @@ -595,15 +627,20 @@ TEST_F(TestMockImageSyncObjectCopyRequest, WriteSnaps) {
expect_list_snaps(mock_remote_image_ctx, mock_remote_io_ctx, 0);
expect_set_snap_read(mock_remote_io_ctx, m_remote_snap_ids[0]);
expect_sparse_read(mock_remote_io_ctx, 0, one.range_end(), 0);
expect_start_op(mock_exclusive_lock);
expect_write(mock_local_io_ctx, 0, one.range_end(), {0, {}}, 0);
expect_set_snap_read(mock_remote_io_ctx, m_remote_snap_ids[2]);
expect_sparse_read(mock_remote_io_ctx, two, 0);
expect_start_op(mock_exclusive_lock);
expect_write(mock_local_io_ctx, two,
{m_local_snap_ids[0], {m_local_snap_ids[0]}}, 0);
expect_start_op(mock_exclusive_lock);
expect_update_object_map(mock_local_image_ctx, mock_object_map,
m_local_snap_ids[0], OBJECT_EXISTS, 0);
expect_start_op(mock_exclusive_lock);
expect_update_object_map(mock_local_image_ctx, mock_object_map,
m_local_snap_ids[1], OBJECT_EXISTS, 0);
expect_start_op(mock_exclusive_lock);
expect_update_object_map(mock_local_image_ctx, mock_object_map,
m_local_snap_ids[2], OBJECT_EXISTS_CLEAN, 0);

Expand All @@ -629,6 +666,9 @@ TEST_F(TestMockImageSyncObjectCopyRequest, Trim) {
librbd::MockTestImageCtx mock_remote_image_ctx(*m_remote_image_ctx);
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

librbd::MockObjectMap mock_object_map;
mock_local_image_ctx.object_map = &mock_object_map;

Expand All @@ -647,10 +687,14 @@ TEST_F(TestMockImageSyncObjectCopyRequest, Trim) {
expect_list_snaps(mock_remote_image_ctx, mock_remote_io_ctx, 0);
expect_set_snap_read(mock_remote_io_ctx, m_remote_snap_ids[0]);
expect_sparse_read(mock_remote_io_ctx, 0, one.range_end(), 0);
expect_start_op(mock_exclusive_lock);
expect_write(mock_local_io_ctx, 0, one.range_end(), {0, {}}, 0);
expect_start_op(mock_exclusive_lock);
expect_truncate(mock_local_io_ctx, trim_offset, 0);
expect_start_op(mock_exclusive_lock);
expect_update_object_map(mock_local_image_ctx, mock_object_map,
m_local_snap_ids[0], OBJECT_EXISTS, 0);
expect_start_op(mock_exclusive_lock);
expect_update_object_map(mock_local_image_ctx, mock_object_map,
m_local_snap_ids[1], OBJECT_EXISTS, 0);

Expand All @@ -673,6 +717,9 @@ TEST_F(TestMockImageSyncObjectCopyRequest, Remove) {
librbd::MockTestImageCtx mock_remote_image_ctx(*m_remote_image_ctx);
librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);

librbd::MockExclusiveLock mock_exclusive_lock;
mock_local_image_ctx.exclusive_lock = &mock_exclusive_lock;

librbd::MockObjectMap mock_object_map;
mock_local_image_ctx.object_map = &mock_object_map;

Expand All @@ -691,10 +738,14 @@ TEST_F(TestMockImageSyncObjectCopyRequest, Remove) {
expect_list_snaps(mock_remote_image_ctx, mock_remote_io_ctx, 0);
expect_set_snap_read(mock_remote_io_ctx, m_remote_snap_ids[1]);
expect_sparse_read(mock_remote_io_ctx, 0, one.range_end(), 0);
expect_start_op(mock_exclusive_lock);
expect_write(mock_local_io_ctx, 0, one.range_end(), {0, {}}, 0);
expect_start_op(mock_exclusive_lock);
expect_remove(mock_local_io_ctx, 0);
expect_start_op(mock_exclusive_lock);
expect_update_object_map(mock_local_image_ctx, mock_object_map,
m_local_snap_ids[0], OBJECT_EXISTS, 0);
expect_start_op(mock_exclusive_lock);
expect_update_object_map(mock_local_image_ctx, mock_object_map,
m_local_snap_ids[1], OBJECT_EXISTS_CLEAN, 0);

Expand Down