From 966e1080558e9d7f6ec5a355d8848ceb218a2c97 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Mon, 29 Dec 2014 16:16:23 +0800 Subject: [PATCH] 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 --- src/mds/MDCache.cc | 1 - src/mds/Server.cc | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 50439bc2164b2..8696be773e6b0 100644 --- 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 c36e400290688..24cf29882a455 100644 --- 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); -- 2.39.5