mds: project_snaprealm in project_and_dirty_inode. Fix users.

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 670ac671420890a71d98853a8dbb53902b0fba20..1ed9ab4d226030b62613fdc23fbb69fe1a0c8209 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -240,6 +240,9 @@ void CInode::pop_and_dirty_projected_inode(LogSegment *ls)
     delete px;
   }
 
+  if (projected_nodes.front()->snapnode)
+    pop_projected_snaprealm(projected_nodes.front()->snapnode);
+
   delete projected_nodes.front()->inode;
   delete projected_nodes.front();
 

diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index e234a1581e50639637c372cdc227aa0564bf0ca0..24e93907b24a348bba1de9aa6ccb26e3e96a461e 100644 (file)
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -240,7 +240,6 @@ public:
   }
 
   sr_t *project_snaprealm(snapid_t snapid=0);
-  void pop_projected_snaprealm(sr_t *next_snaprealm);
   sr_t *get_projected_srnode() {
     if (!projected_snaprealm_ptr)
       if (snaprealm)
@@ -251,6 +250,10 @@ public:
   }
   void project_past_parent(SnapRealm *newparent, bufferlist& snapbl);
 
+private:
+  void pop_projected_snaprealm(sr_t *next_snaprealm);
+
+public:
   old_inode_t& cow_old_inode(snapid_t follows, inode_t *pi);
   old_inode_t *pick_old_inode(snapid_t last);
   void pre_cow_old_inode();

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 2a735beee9d1bc3a9df81ae72e30177ac21a1099..7743e2dc9cc7a2947fbd99d2c4450f0381111d13 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -4088,26 +4088,21 @@ void Server::_unlink_local_finish(MDRequest *mdr,
 
   // relink as stray?  (i.e. was primary link?)
   CDentry::linkage_t *straydnl = 0;
-  sr_t *next_snap = 0;
+
+  bool snap_is_new = false;
   if (straydn) {
     dout(20) << " straydn is " << *straydn << dendl;
     straydnl = straydn->pop_projected_linkage();
     
-    next_snap = straydnl->get_inode()->projected_nodes.front()->snapnode;
+    snap_is_new = straydnl->get_inode()->snaprealm ? false : true;
     mdcache->touch_dentry_bottom(straydn);
   }
 
   dn->mark_dirty(dnpv, mdr->ls);
   mdr->apply();
 
-  if (straydn) {
-    bool isnew = false;
-    if (!straydnl->get_inode()->snaprealm)
-      isnew = true;
-    straydnl->get_inode()->pop_projected_snaprealm(next_snap);
-    if (isnew)
+  if (snap_is_new) //only new if straydnl exists
       mdcache->do_realm_invalidate_and_update_notify(straydnl->get_inode(), CEPH_SNAP_OP_SPLIT, true);
-  }
   
   mds->mdcache->send_dentry_unlink(dn, straydn);
   
@@ -4880,16 +4875,6 @@ void Server::_rename_apply(MDRequest *mdr, CDentry *srcdn, CDentry *destdn, CDen
        straydnl = straydn->pop_projected_linkage();
       else
        straydn->get_dir()->link_primary_inode(straydn, oldin);
-      
-      if (straydn->is_auth()) {
-       bool isnew = false;
-       if (!straydnl->get_inode()->snaprealm)
-         isnew = true;
-       sr_t *next_snap = straydnl->get_inode()->projected_nodes.front()->snapnode;
-       straydnl->get_inode()->pop_projected_snaprealm(next_snap);
-       if (isnew)
-         mdcache->do_realm_invalidate_and_update_notify(straydnl->get_inode(), CEPH_SNAP_OP_SPLIT);
-      }
 
       mdcache->touch_dentry_bottom(straydn);  // drop dn as quickly as possible.
 
@@ -4897,8 +4882,12 @@ void Server::_rename_apply(MDRequest *mdr, CDentry *srcdn, CDentry *destdn, CDen
       destdn->get_dir()->unlink_inode(destdn);
     }
     // nlink-- targeti
-    if (oldin->is_auth())
+    if (oldin->is_auth() && destdnl->is_primary()) {
+      bool hadrealm = (oldin->snaprealm ? true : false);
       oldin->pop_and_dirty_projected_inode(mdr->ls);
+      if (oldin->snaprealm && !hadrealm)
+        mdcache->do_realm_invalidate_and_update_notify(oldin, CEPH_SNAP_OP_SPLIT);
+    }
   }
 
   // dest
@@ -4945,10 +4934,8 @@ void Server::_rename_apply(MDRequest *mdr, CDentry *srcdn, CDentry *destdn, CDen
       destdnl->get_inode()->state_set(CInode::STATE_AUTH);
     }
 
-    sr_t *next_snap = NULL;
     if (destdn->is_auth()) {
       CInode *desti = destdnl->get_inode();
-      next_snap = desti->projected_nodes.front()->snapnode;
       desti->pop_and_dirty_projected_inode(mdr->ls);
 
       if (desti->is_dir()) {
@@ -4957,10 +4944,6 @@ void Server::_rename_apply(MDRequest *mdr, CDentry *srcdn, CDentry *destdn, CDen
        dout(10) << "added dir to logsegment renamed_files list " << *desti << dendl;
       }
     }
-
-    // snap parent update?
-    if (next_snap)
-      destdnl->get_inode()->pop_projected_snaprealm(next_snap);
   }
 
   // src
@@ -5745,24 +5728,20 @@ void Server::_mksnap_finish(MDRequest *mdr, CInode *diri, SnapInfo &info)
 {
   dout(10) << "_mksnap_finish " << *mdr << " " << info << dendl;
 
-  sr_t *next_snaprealm = diri->projected_nodes.front()->snapnode;
-
   diri->pop_and_dirty_projected_inode(mdr->ls);
   mdr->apply();
 
   mds->snapclient->commit(mdr->more()->stid, mdr->ls);
 
   // create snap
-  snapid_t snapid = info.snapid;
   int op = (diri->snaprealm? CEPH_SNAP_OP_CREATE : CEPH_SNAP_OP_SPLIT);
-  diri->pop_projected_snaprealm(next_snaprealm);
   dout(10) << "snaprealm now " << *diri->snaprealm << dendl;
 
   mdcache->do_realm_invalidate_and_update_notify(diri, op);
 
   // yay
   mdr->in[0] = diri;
-  mdr->snapid = snapid;
+  mdr->snapid = info.snapid;
   MClientReply *reply = new MClientReply(mdr->client_request, 0);
   reply->snapbl = diri->snaprealm->get_snap_trace();
   reply_request(mdr, reply, diri);
@@ -5874,15 +5853,11 @@ void Server::_rmsnap_finish(MDRequest *mdr, CInode *diri, snapid_t snapid)
   snapid_t seq;
   ::decode(seq, p);  
 
-  sr_t *next_snaprealm = diri->projected_nodes.front()->snapnode;
-
   diri->pop_and_dirty_projected_inode(mdr->ls);
   mdr->apply();
 
   mds->snapclient->commit(stid, mdr->ls);
 
-  // remove snap
-  diri->pop_projected_snaprealm(next_snaprealm);
   dout(10) << "snaprealm now " << *diri->snaprealm << dendl;
 
   mdcache->do_realm_invalidate_and_update_notify(diri, CEPH_SNAP_OP_DESTROY);