]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
test/cls_rbd: removed mirror peer pool test cases 31485/head
authorJason Dillaman <dillaman@redhat.com>
Wed, 16 Oct 2019 00:42:29 +0000 (20:42 -0400)
committerNathan Cutler <ncutler@suse.com>
Fri, 8 Nov 2019 13:15:14 +0000 (14:15 +0100)
commitd802ff580caebaab0aa48974a4138c0c2e85288d
tree12b8dfc841509e93d4c330d52b30ad7d45e9fe7a
parente46b9f0bd2ff2f56ea774539598d87b33d525cf3
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 <dillaman@redhat.com>
(cherry picked from commit f0492ebd677cb8cb4656fc8f1dc871db1a6e7753)

Conflicts:
src/cls/rbd/cls_rbd_client.cc
src/cls/rbd/cls_rbd_client.h
- I could not find the reason for the conflicts; it seems that git
  got confused. Cherry-picked the changes in these two files manually.
src/cls/rbd/cls_rbd_client.cc
src/cls/rbd/cls_rbd_client.h
src/test/cls_rbd/test_cls_rbd.cc