From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Sun, 23 Mar 2014 10:18:19 +0000 (+0800)
Subject: mds: explicitly set nonce for imported dirfrag
X-Git-Tag: v0.79~52^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fbf4fbc37a609f44fe4ca628d8151d6d38314afb;p=ceph.git

mds: explicitly set nonce for imported dirfrag

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 62a6300caaab..08cf06c00d2d 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -2813,7 +2813,7 @@ int Migrator::decode_import_dir(bufferlist::iterator& blp,
 
   // adjust replica list
   //assert(!dir->is_replica(oldauth));    // not true on failed export
-  dir->add_replica(oldauth);
+  dir->add_replica(oldauth, CDir::EXPORT_NONCE);
   if (dir->is_replica(mds->get_nodeid()))
     dir->remove_replica(mds->get_nodeid());