mds: don't manully create snaprealm during rename

project_past_snaprealm_parent() will do the same job. Besides
MDCache::_snaprealm_create_finish() is buggy, it updates snaprealm's
current_parent_since incorrectly

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

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 50439bc2164b21e9dba96d19c619538be39a47f0..8696be773e6b01030911ab6a2dc5a8d278daafb6 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -8862,7 +8862,6 @@ void MDCache::_snaprealm_create_finish(MDRequestRef& mdr, MutationRef& mut, CIno
   in->snaprealm->open = true;
   in->snaprealm->srnode.seq = seq;
   in->snaprealm->srnode.created = seq;
-  in->snaprealm->srnode.current_parent_since = seq;
 
   do_realm_invalidate_and_update_notify(in, CEPH_SNAP_OP_SPLIT);
 

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index c36e400290688ab15b6f5ff5edd8eb5e2c25afd5..24cf29882a455fcb0baedc1299e8d769e19dae8f 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -5962,6 +5962,8 @@ void Server::handle_client_rename(MDRequestRef& mdr)
     return;
   }
 
+  /* project_past_snaprealm_parent() will do this job
+   *
   // moving between snaprealms?
   if (srcdnl->is_primary() && srci->is_multiversion() && !srci->snaprealm) {
     SnapRealm *srcrealm = srci->find_snaprealm();
@@ -5974,6 +5976,7 @@ void Server::handle_client_rename(MDRequestRef& mdr)
       return;
     }
   }
+  */
 
   assert(g_conf->mds_kill_rename_at != 1);