RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 01:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16264 from dillaman/wip-20571

Browse Source 
rbd-mirror: ignore permission errors on rbd_mirroring object

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
This commit is contained in:
Mykola Golub 2017-07-13 10:57:42 +03:00 committed by GitHub
commit 0c169bbdbc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/rbd_mirror/ClusterWatcher.cc
View File

@ -4,6 +4,7 @@
#include "ClusterWatcher.h"
#include "common/debug.h"
#include "common/errno.h"
#include "cls/rbd/cls_rbd_client.h"
#include "librbd/internal.h"
#include "librbd/api/Mirror.h"
@ -89,14 +90,17 @@ void ClusterWatcher::read_pool_peers(PoolPeers *pool_peers,
continue;
}
rbd_mirror_mode_t mirror_mode;
r = librbd::api::Mirror<>::mode_get(ioctx, &mirror_mode);
if (r < 0) {
cls::rbd::MirrorMode mirror_mode_internal;
r = librbd::cls_client::mirror_mode_get(&ioctx, &mirror_mode_internal);
if (r == -EPERM) {
dout(10) << "access denied querying pool " << pool_name << dendl;
continue;
} else if (r < 0) {
derr << "could not tell whether mirroring was enabled for " << pool_name
<< " : " << cpp_strerror(r) << dendl;
continue;
}
if (mirror_mode == RBD_MIRROR_MODE_DISABLED) {
if (mirror_mode_internal == cls::rbd::MIRROR_MODE_DISABLED) {
dout(10) << "mirroring is disabled for pool " << pool_name << dendl;
continue;
}