Revert "mds/rejoin: Handle referent inode on MDSCache rejoin"

This reverts commit 2ec2c1d63b994f57cf0b50744ba074026ddc39fd.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit e1bf0f452b0aea23c96f9ab47ce406d59295e242)

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 7b65c476c66cda99358edd4ac6092837ff6a740f..927e80acb35fb063ef76f45df586fb2fa801de9f 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -4377,9 +4377,8 @@ void MDCache::rejoin_walk(CDir *dir, const ref_t<MMDSCacheRejoin> &rejoin)
       rejoin->add_strong_dentry(dir->dirfrag(), dn->get_name(), dn->get_alternate_name(),
                                 dn->first, dn->last,
                                dnl->is_primary() ? dnl->get_inode()->ino():inodeno_t(0),
-                               (dnl->is_remote() || dnl->is_referent_remote())? dnl->get_remote_ino():inodeno_t(0),
-                               dnl->is_referent_remote() ? dnl->get_referent_inode()->ino():inodeno_t(0),
-                               (dnl->is_remote() || dnl->is_referent_remote())? dnl->get_remote_d_type():0,
+                               dnl->is_remote() ? dnl->get_remote_ino():inodeno_t(0),
+                               dnl->is_remote() ? dnl->get_remote_d_type():0, 
                                dn->get_replica_nonce(),
                                dn->lock.get_state());
       dn->state_set(CDentry::STATE_REJOINING);
@@ -4600,7 +4599,7 @@ void MDCache::handle_cache_rejoin_weak(const cref_t<MMDSCacheRejoin> &weak)
       if (ack) 
        ack->add_strong_dentry(dir->dirfrag(), dn->get_name(), dn->get_alternate_name(),
                                dn->first, dn->last,
-                              dnl->get_inode()->ino(), inodeno_t(0), inodeno_t(0), 0,
+                              dnl->get_inode()->ino(), inodeno_t(0), 0, 
                               dnonce, dn->lock.get_replica_state());
 
       // inode
@@ -4849,22 +4848,9 @@ void MDCache::handle_cache_rejoin_strong(const cref_t<MMDSCacheRejoin> &strong)
          dn = dir->lookup(ss.name, ss.snapid);
         }
         if (!dn) {
-         if (d.is_remote() || d.is_referent_remote()) {
-           CInode *ref_in = nullptr;
-           if (d.is_referent_remote()) {
-             // TODO: ss.snapid for referent inode ? Since it's not snapped, always use
-             // default CEPH_NOSNAP. Validate this by testing.
-             ref_in = get_inode(d.referent_ino);
-             if (!ref_in) {
-               dout(20) << __func__ << " rejoin:  no dentry, referent inode not found in memory inventing " << dendl;
-               ref_in = rejoin_invent_inode(d.referent_ino, CEPH_NOSNAP);
-                ref_in->set_remote_ino(d.remote_ino);
-             }
-             dout(20) << __func__ << " rejoin: no dentry, referent inode invented " << *ref_in << dendl;
-           } else {
-             dout(20) << __func__ << " rejoin: no dentry, add remote inode " << dendl;
-           }
-           dn = dir->add_remote_dentry(ss.name, ref_in, d.remote_ino, d.remote_d_type, mempool::mds_co::string(d.alternate_name), d.first, ss.snapid);
+         if (d.is_remote()) {
+           //TODO: Fix for referent remote
+           dn = dir->add_remote_dentry(ss.name, nullptr, d.remote_ino, d.remote_d_type, mempool::mds_co::string(d.alternate_name), d.first, ss.snapid);
          } else if (d.is_null()) {
            dn = dir->add_null_dentry(ss.name, d.first, ss.snapid);
          } else {
@@ -5133,14 +5119,6 @@ void MDCache::handle_cache_rejoin_ack(const cref_t<MMDSCacheRejoin> &ack)
            dout(10) << " had bad linkage for " << *dn <<  dendl;
            dir->unlink_inode(dn);
          }
-        } else if (dnl->is_referent_remote()) {
-         if (!q.second.is_referent_remote() ||
-             q.second.remote_ino != dnl->get_remote_ino() ||
-             q.second.remote_d_type != dnl->get_remote_d_type() ||
-             q.second.referent_ino != dnl->get_referent_ino()) {
-           dout(10) << __func__ << " had bad referent remote linkage for " << *dn <<  dendl;
-           dir->unlink_inode(dn);
-         }
         } else {
          if (!q.second.is_null())
            dout(10) << " had bad linkage for " << *dn <<  dendl;
@@ -5150,24 +5128,6 @@ void MDCache::handle_cache_rejoin_ack(const cref_t<MMDSCacheRejoin> &ack)
        if (dnl->is_null() && !q.second.is_null()) {
          if (q.second.is_remote()) {
            dn->dir->link_remote_inode(dn, q.second.remote_ino, q.second.remote_d_type);
-         } else if (q.second.is_referent_remote()) {
-           CInode *ref_in = get_inode(q.second.referent_ino, CEPH_NOSNAP);
-           if (!ref_in) {
-             // barebones inode;
-             ref_in = new CInode(this, false, 2, CEPH_NOSNAP);
-             auto _inode = ref_in->_get_inode();
-             _inode->ino = q.second.referent_ino;
-             _inode->mode = S_IFREG;
-             _inode->layout = default_file_layout;
-             add_inode(ref_in);
-             dout(10) << __func__ << " add inode " << *ref_in << dendl;
-           } else if (ref_in->get_parent_dn()) {
-             dout(10) << __func__ << " had bad referent linkage for " << *(ref_in->get_parent_dn())
-                      << ", unlinking referent inode" << *ref_in << dendl;
-             ref_in->get_parent_dir()->unlink_inode(ref_in->get_parent_dn());
-           }
-           dn->dir->link_referent_inode(dn, ref_in, q.second.remote_ino, q.second.remote_d_type);
-           isolated_inodes.erase(ref_in);
          } else {
            CInode *in = get_inode(q.second.ino, q.first.snapid);
            if (!in) {
@@ -6265,9 +6225,8 @@ void MDCache::rejoin_send_acks()
          it->second->add_strong_dentry(dir->dirfrag(), dn->get_name(), dn->get_alternate_name(),
                                            dn->first, dn->last,
                                           dnl->is_primary() ? dnl->get_inode()->ino():inodeno_t(0),
-                                          (dnl->is_remote() || dnl->is_referent_remote()) ? dnl->get_remote_ino():inodeno_t(0),
-                                          dnl->is_referent_remote() ? dnl->get_referent_inode()->ino():inodeno_t(0),
-                                          (dnl->is_remote() || dnl->is_referent_remote()) ? dnl->get_remote_d_type():0,
+                                          dnl->is_remote() ? dnl->get_remote_ino():inodeno_t(0),
+                                          dnl->is_remote() ? dnl->get_remote_d_type():0,
                                           ++r.second,
                                           dn->lock.get_replica_state());
          // peer missed MDentrylink message ?

diff --git a/src/mds/MDSDaemon.h b/src/mds/MDSDaemon.h
index 955963628d1702a1a10c53c272b5fea5ddcb8f7c..3d631bfdd832af324efc88de4c931af70762c4e1 100644 (file)
--- a/src/mds/MDSDaemon.h
+++ b/src/mds/MDSDaemon.h
@@ -26,7 +26,7 @@
 
 #include "Beacon.h"
 
-#define CEPH_MDS_PROTOCOL    37 /* cluster internal */
+#define CEPH_MDS_PROTOCOL    36 /* cluster internal */
 
 namespace boost::asio { class io_context; }
 class Context;

diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h
index 08872c5c927c09269a4983bc93bb4332c9b9e289..9237c79b6e77f469e50a3134d575d48b65f2257d 100644 (file)
--- a/src/messages/MMDSCacheRejoin.h
+++ b/src/messages/MMDSCacheRejoin.h
@@ -108,16 +108,14 @@ public:
     std::string alternate_name;
     inodeno_t ino = 0;
     inodeno_t remote_ino = 0;
-    inodeno_t referent_ino = 0;
     unsigned char remote_d_type = 0;
     uint32_t nonce = 0;
     int32_t lock = 0;
     dn_strong() = default;
-    dn_strong(snapid_t f, std::string_view altn, inodeno_t pi, inodeno_t ri, inodeno_t ref_ino, unsigned char rdt, int n, int l) :
-      first(f), alternate_name(altn), ino(pi), remote_ino(ri), referent_ino(ref_ino), remote_d_type(rdt), nonce(n), lock(l) {}
+    dn_strong(snapid_t f, std::string_view altn, inodeno_t pi, inodeno_t ri, unsigned char rdt, int n, int l) :
+      first(f), alternate_name(altn), ino(pi), remote_ino(ri), remote_d_type(rdt), nonce(n), lock(l) {}
     bool is_primary() const { return ino > 0; }
     bool is_remote() const { return remote_ino > 0; }
-    bool is_referent_remote() const { return remote_ino > 0 && referent_ino > 0; }
     bool is_null() const { return ino == 0 && remote_ino == 0; }
     void encode(ceph::buffer::list &bl) const {
       using ceph::encode;
@@ -128,7 +126,6 @@ public:
       encode(nonce, bl);
       encode(lock, bl);
       encode(alternate_name, bl);
-      encode(referent_ino, bl);
     }
     void decode(ceph::buffer::list::const_iterator &bl) {
       using ceph::decode;
@@ -139,17 +136,15 @@ public:
       decode(nonce, bl);
       decode(lock, bl);
       decode(alternate_name, bl);
-      decode(referent_ino, bl);
     }
     static void generate_test_instances(std::list<dn_strong*>& ls) {
       ls.push_back(new dn_strong);
-      ls.push_back(new dn_strong(1, "alternate_name", 2, 3, 4, 5, 6, 7));
+      ls.push_back(new dn_strong(1, "alternate_name", 2, 3, 4, 5, 6));
     }
     void dump(ceph::Formatter *f) const {
       f->dump_unsigned("first", first);
       f->dump_string("alternate_name", alternate_name);
       f->dump_unsigned("ino", ino);
-      f->dump_unsigned("referent_ino", referent_ino);
       f->dump_unsigned("remote_ino", remote_ino);
       f->dump_unsigned("remote_d_type", remote_d_type);
       f->dump_unsigned("nonce", nonce);
@@ -280,9 +275,9 @@ public:
   void add_weak_primary_dentry(inodeno_t dirino, std::string_view dname, snapid_t first, snapid_t last, inodeno_t ino) {
     weak[dirino][string_snap_t(dname, last)] = dn_weak(first, ino);
   }
-  void add_strong_dentry(dirfrag_t df, std::string_view dname, std::string_view altn, snapid_t first, snapid_t last, inodeno_t pi, inodeno_t ri, inodeno_t ref_ino, unsigned char rdt, int n, int ls) {
+  void add_strong_dentry(dirfrag_t df, std::string_view dname, std::string_view altn, snapid_t first, snapid_t last, inodeno_t pi, inodeno_t ri, unsigned char rdt, int n, int ls) {
     auto& m = strong_dentries[df];
-    m.insert_or_assign(string_snap_t(dname, last), dn_strong(first, altn, pi, ri, ref_ino, rdt, n, ls));
+    m.insert_or_assign(string_snap_t(dname, last), dn_strong(first, altn, pi, ri, rdt, n, ls));
   }
   void add_dentry_authpin(dirfrag_t df, std::string_view dname, snapid_t last,
                          const metareqid_t& ri, __u32 attempt) {