From 7aef2976084b8be858e354a05dae12df30743737 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 3 May 2016 23:15:58 -0400 Subject: [PATCH] rbd-mirror: don't set object map to nonexistent during image sync The object maps are initialized to nonexistent at snapshot creation, so this operation is unnecessary. Signed-off-by: Jason Dillaman (cherry picked from commit fe5d4a811f9d9d1160ff7104fe9243cc17ef1bef) --- src/test/rbd_mirror/image_sync/test_mock_ObjectCopyRequest.cc | 2 -- src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc | 1 - 2 files changed, 3 deletions(-) diff --git a/src/test/rbd_mirror/image_sync/test_mock_ObjectCopyRequest.cc b/src/test/rbd_mirror/image_sync/test_mock_ObjectCopyRequest.cc index d99d7dfae1b05..69c4c64646524 100644 --- a/src/test/rbd_mirror/image_sync/test_mock_ObjectCopyRequest.cc +++ b/src/test/rbd_mirror/image_sync/test_mock_ObjectCopyRequest.cc @@ -537,8 +537,6 @@ TEST_F(TestMockImageSyncObjectCopyRequest, Remove) { expect_remove(mock_local_io_ctx, 0); expect_update_object_map(mock_local_image_ctx, mock_object_map, m_local_snap_ids[0], OBJECT_EXISTS, 0); - expect_update_object_map(mock_local_image_ctx, mock_object_map, - m_local_snap_ids[1], OBJECT_NONEXISTENT, 0); request->send(); ASSERT_EQ(0, ctx.wait()); diff --git a/src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc b/src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc index 7cf12923df5a8..23497bab1cb7d 100644 --- a/src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc +++ b/src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc @@ -333,7 +333,6 @@ void ObjectCopyRequest::compute_diffs() { end_size, 0U, bufferlist()); } } else { - m_snap_object_states[end_snap_id] = OBJECT_NONEXISTENT; if (prev_exists) { // object remove ldout(cct, 20) << ": remove op" << dendl; -- 2.39.5