From: Yan, Zheng <zyan@redhat.com>
Date: Wed, 28 Dec 2016 08:48:33 +0000 (+0800)
Subject: mds: add replicas of destdn to rename witness list
X-Git-Tag: v12.0.0~220^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=da1e2614aba17d1507d722688f0e4d91c9bf9edd;p=ceph-ci.git

mds: add replicas of destdn to rename witness list

it's possible that null dentry is replicated

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 88ded97796f..1ad52eaff02 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -6342,11 +6342,9 @@ void Server::handle_client_rename(MDRequestRef& mdr)
     witnesses.insert(srcdn->authority().first);
   if (srcdnl->is_remote() && !srci->is_auth())
     witnesses.insert(srci->authority().first);
-  if (!destdnl->is_null()) {
-    destdn->list_replicas(witnesses);
-    if (destdnl->is_remote() && !oldin->is_auth())
-      witnesses.insert(oldin->authority().first);
-  }
+  destdn->list_replicas(witnesses);
+  if (destdnl->is_remote() && !oldin->is_auth())
+    witnesses.insert(oldin->authority().first);
   dout(10) << " witnesses " << witnesses << ", have " << mdr->more()->witnessed << dendl;