Merge PR ceph#62231 into main

* refs/pull/62231/head:
	mds: set alternate_name for new fullbit dentries
	qa: test alternate_name recovery during mds failover

Reviewed-by: Venky Shankar <[email protected]>
Reviewed-by: Kotresh Hiremath Ravishankar <[email protected]>

Author: batrick

qa/tasks/cephfs/test_dir_charmap.py

@@ -269,6 +269,51 @@ def test_cs_not_empty_set_insensitive(self):
             else:
                 self.fail("should fail")
 
+
+class TestCharMapRecovery(CephFSTestCase, CharMapMixin):
+    CLIENTS_REQUIRED = 1
+    MDSS_REQUIRED = 1
+
+    def test_primary_altname_recovery(self):
+        """
+        That the MDS can recovery the alternate_name from the primary link
+        encoded in the fullbit.
+        """
+
+        dname = "Grüßen"
+        self.mount_a.run_shell_payload("mkdir foo/")
+        self.mount_a.setfattr("foo/", "ceph.dir.casesensitive", "0")
+        self.mount_a.run_shell_payload(f"dd if=/dev/urandom of=foo/{dname} conv=fsync bs=1 count=1")
+        self.mount_a.umount_wait()
+
+        self.fs.fail()
+        self.fs.set_joinable()
+        self.fs.wait_for_daemons()
+
+        self.mount_a.mount()
+        self.mount_a.run_shell_payload("ls -l foo")
+
+    def test_remote_altname_recovery(self):
+        """
+        That the MDS can recovery the alternate_name from the remote link
+        encoded in the fullbit.
+        """
+
+        dname = "Grüßen"
+        self.mount_a.run_shell_payload("mkdir foo/")
+        self.mount_a.setfattr("foo/", "ceph.dir.casesensitive", "0")
+        self.mount_a.run_shell_payload("dd if=/dev/urandom of=foo/file conv=fsync bs=1 count=1")
+        self.mount_a.run_shell_payload(f"ln -T foo/file foo/{dname}")
+        self.mount_a.umount_wait()
+
+        self.fs.fail()
+        self.fs.set_joinable()
+        self.fs.wait_for_daemons()
+
+        self.mount_a.mount()
+        self.mount_a.run_shell_payload("ls -l foo")
+
+
 class TestNormalization(CephFSTestCase, CharMapMixin):
     """
     Test charmap normalization.

src/mds/journal.cc

@@ -1380,13 +1380,15 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, int type, MDPeerUpdate
 	dn->set_version(fb.dnv);
 	if (fb.is_dirty()) dn->_mark_dirty(logseg);
 	dout(10) << "EMetaBlob.replay added (full) " << *dn << dendl;
+        dn->set_alternate_name(mempool::mds_co::string(fb.alternate_name));
       } else {
 	dn->set_version(fb.dnv);
 	if (fb.is_dirty()) dn->_mark_dirty(logseg);
 	dout(10) << "EMetaBlob.replay for [" << fb.dnfirst << "," << fb.dnlast << "] had " << *dn << dendl;
 	dn->first = fb.dnfirst;
 	ceph_assert(dn->last == fb.dnlast);
       }
+      ceph_assert(dn->get_alternate_name() == fb.alternate_name);
       if (lump.is_importing())
 	dn->mark_auth();
 
@@ -1504,7 +1506,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, int type, MDPeerUpdate
 	dn->first = rb.dnfirst;
 	ceph_assert(dn->last == rb.dnlast);
       }
-
+      ceph_assert(dn->get_alternate_name() == rb.alternate_name);
       if (lump.is_importing())
 	dn->mark_auth();