From: Ricardo Dias <rdias@suse.com>
Date: Fri, 8 Apr 2016 10:00:55 +0000 (+0100)
Subject: rbd-mirror: fixed bug that caused infinite loop when disabling image mirroring
X-Git-Tag: v10.1.2~26^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8504%2Fhead;p=ceph.git

rbd-mirror: fixed bug that caused infinite loop when disabling image mirroring

Signed-off-by: Ricardo Dias <rdias@suse.com>
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 6ace24f1d8f8..2abc1a2559b7 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -341,6 +341,7 @@ int mirror_image_disable_internal(ImageCtx *ictx, bool force) {
   header_oid = ::journal::Journaler::header_oid(ictx->id);
 
   while(true) {
+    clients.clear();
     r = cls::journal::client::client_list(ictx->md_ctx, header_oid, &clients);
     if (r < 0) {
       lderr(cct) << "cannot disable mirroring: " << cpp_strerror(r) << dendl;