From: Ilya Dryomov <idryomov@gmail.com>
Date: Wed, 6 Mar 2019 14:43:12 +0000 (+0100)
Subject: test/librbd: observe the object map interaction in DiscardRemoveTruncate
X-Git-Tag: v14.1.1~2^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=95c6b36b6c1635050219b40b206b864d8de7c2ad;p=ceph-ci.git

test/librbd: observe the object map interaction in DiscardRemoveTruncate

Undo the fixup made in merge commit a7351ce449bb ("Merge pull request
#20809 from idryomov/wip-librbd-discard-create-truncate").  We do want
to observe the object map interaction here -- specific changes towards
that were made in commits 513baf92ef01 ("test/librbd: clone with parent
features in DiscardRemoveTruncate") and 9d6ee9a64986 ("test/librbd:
expect_object_may_exist(..., false) in DiscardRemoveTruncate").

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/src/test/librbd/io/test_mock_ObjectRequest.cc b/src/test/librbd/io/test_mock_ObjectRequest.cc
index 07f1888c8a2..2e2122cc36a 100644
--- a/src/test/librbd/io/test_mock_ObjectRequest.cc
+++ b/src/test/librbd/io/test_mock_ObjectRequest.cc
@@ -884,6 +884,7 @@ TEST_F(TestMockIoObjectRequest, DiscardRemoveTruncate) {
   expect_get_parent_overlap(mock_image_ctx, CEPH_NOSNAP, 4096, 0);
   expect_prune_parent_extents(mock_image_ctx, {{0, 4096}}, 4096, 4096);
   expect_object_may_exist(mock_image_ctx, 0, false);
+  expect_object_map_update(mock_image_ctx, 0, 1, OBJECT_EXISTS, {}, false, 0);
   expect_create(mock_image_ctx, false);
   expect_truncate(mock_image_ctx, 0, 0);
 
@@ -891,8 +892,7 @@ TEST_F(TestMockIoObjectRequest, DiscardRemoveTruncate) {
   auto req = MockObjectDiscardRequest::create_discard(
     &mock_image_ctx, ictx->get_object_name(0), 0, 0,
     mock_image_ctx.get_object_size(), mock_image_ctx.snapc,
-    OBJECT_DISCARD_FLAG_DISABLE_CLONE_REMOVE |
-      OBJECT_DISCARD_FLAG_DISABLE_OBJECT_MAP_UPDATE, {}, &ctx);
+    OBJECT_DISCARD_FLAG_DISABLE_CLONE_REMOVE, {}, &ctx);
   req->send();
   ASSERT_EQ(0, ctx.wait());
 }