]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
cls/rbd: sanitize the mirror image status peer address after reading from disk 31833/head
authorJason Dillaman <dillaman@redhat.com>
Sat, 23 Nov 2019 15:36:31 +0000 (10:36 -0500)
committerJason Dillaman <dillaman@redhat.com>
Sat, 23 Nov 2019 15:36:51 +0000 (10:36 -0500)
commit57379c81a26c40db25c5dc32cc89e1745ccefd9c
tree47bb9cca5b751fd803617f4a275ae7d9ea44c91b
parentdfd3c3f5e400e90c7997c09b18939f978f48bf1d
cls/rbd: sanitize the mirror image status peer address after reading from disk

RADOS upgrade tests were failing when OSDs were partially upgraded since the
entity_addr_t::type overload wasn't being recovered when re-read. Now we will
always sanitize the on-disk entity address after reading it to avoid such
issues of on-disk encoding/decoding.

Fixes: https://tracker.ceph.com/issues/42891
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 1542d12e1b893166a5bc7b7a4c9a4474078a98be)

Conflicts:
src/cls/rbd/cls_rbd(_types).[h|cc]: the MirrorImageStatusOnDisk struct has moved
src/cls/rbd/cls_rbd.cc