From f0492ebd677cb8cb4656fc8f1dc871db1a6e7753 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 15 Oct 2019 20:42:29 -0400 Subject: [PATCH] test/cls_rbd: removed mirror peer pool test cases The mirror peer pool id has never been used and has been dropped from the Octopus release. This will fix the breakage in the test cases where the pool id was tested. Fixes: https://tracker.ceph.com/issues/42333 Signed-off-by: Jason Dillaman --- src/cls/rbd/cls_rbd_client.cc | 4 ++-- src/cls/rbd/cls_rbd_client.h | 3 +-- src/test/cls_rbd/test_cls_rbd.cc | 10 +++------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/cls/rbd/cls_rbd_client.cc b/src/cls/rbd/cls_rbd_client.cc index ebf2104ad96a..9b868c55d788 100644 --- a/src/cls/rbd/cls_rbd_client.cc +++ b/src/cls/rbd/cls_rbd_client.cc @@ -1808,8 +1808,8 @@ int mirror_peer_list(librados::IoCtx *ioctx, int mirror_peer_add(librados::IoCtx *ioctx, const std::string &uuid, const std::string &cluster_name, - const std::string &client_name, int64_t pool_id) { - cls::rbd::MirrorPeer peer(uuid, cluster_name, client_name, pool_id); + const std::string &client_name) { + cls::rbd::MirrorPeer peer(uuid, cluster_name, client_name, -1); bufferlist in_bl; encode(peer, in_bl); diff --git a/src/cls/rbd/cls_rbd_client.h b/src/cls/rbd/cls_rbd_client.h index e03f0f410c1d..27a64cc23b7d 100644 --- a/src/cls/rbd/cls_rbd_client.h +++ b/src/cls/rbd/cls_rbd_client.h @@ -385,8 +385,7 @@ int mirror_peer_list(librados::IoCtx *ioctx, std::vector *peers); int mirror_peer_add(librados::IoCtx *ioctx, const std::string &uuid, const std::string &cluster_name, - const std::string &client_name, - int64_t pool_id = -1); + const std::string &client_name); int mirror_peer_remove(librados::IoCtx *ioctx, const std::string &uuid); int mirror_peer_set_client(librados::IoCtx *ioctx, diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc index b3ee9e44a12b..8b5bafcea400 100644 --- a/src/test/cls_rbd/test_cls_rbd.cc +++ b/src/test/cls_rbd/test_cls_rbd.cc @@ -1555,21 +1555,17 @@ TEST_F(TestClsRbd, mirror) { ASSERT_EQ(0, mirror_peer_add(&ioctx, "uuid2", "cluster2", "admin")); ASSERT_EQ(-ESTALE, mirror_peer_add(&ioctx, "uuid2", "cluster3", "foo")); ASSERT_EQ(-EEXIST, mirror_peer_add(&ioctx, "uuid3", "cluster1", "foo")); - ASSERT_EQ(0, mirror_peer_add(&ioctx, "uuid3", "cluster3", "admin", 123)); + ASSERT_EQ(0, mirror_peer_add(&ioctx, "uuid3", "cluster3", "admin")); ASSERT_EQ(-EEXIST, mirror_peer_add(&ioctx, "uuid4", "cluster3", "admin")); - ASSERT_EQ(-EEXIST, mirror_peer_add(&ioctx, "uuid4", "cluster3", "admin", 123)); - ASSERT_EQ(0, mirror_peer_add(&ioctx, "uuid4", "cluster3", "admin", 234)); ASSERT_EQ(0, mirror_peer_list(&ioctx, &peers)); std::vector expected_peers = { {"uuid1", "cluster1", "client", -1}, {"uuid2", "cluster2", "admin", -1}, - {"uuid3", "cluster3", "admin", 123}, - {"uuid4", "cluster3", "admin", 234}}; + {"uuid3", "cluster3", "admin", -1}}; ASSERT_EQ(expected_peers, peers); ASSERT_EQ(0, mirror_peer_remove(&ioctx, "uuid5")); - ASSERT_EQ(0, mirror_peer_remove(&ioctx, "uuid4")); ASSERT_EQ(0, mirror_peer_remove(&ioctx, "uuid2")); ASSERT_EQ(-ENOENT, mirror_peer_set_client(&ioctx, "uuid4", "new client")); @@ -1581,7 +1577,7 @@ TEST_F(TestClsRbd, mirror) { ASSERT_EQ(0, mirror_peer_list(&ioctx, &peers)); expected_peers = { {"uuid1", "cluster1", "new client", -1}, - {"uuid3", "new cluster", "admin", 123}}; + {"uuid3", "new cluster", "admin", -1}}; ASSERT_EQ(expected_peers, peers); ASSERT_EQ(-EBUSY, mirror_mode_set(&ioctx, cls::rbd::MIRROR_MODE_DISABLED)); -- 2.47.3