fix(FileSR): Better protect against coalesce during revert

* Properly mark unmanaged base copy
* Disable coalesce on VDIs being worked on
* Fix permission on nfs-on-slave plugin

Signed-off-by: Antoine Bartuccio <antoine.bartuccio@vates.tech>

Author: klmp200

drivers/FileSR.py

@@ -260,12 +260,9 @@ def _undo_all_journals(self):
         if 'SRmaster' in self.dconf and self.dconf['SRmaster'] == 'true':
             is_master = True
 
-        # if self.cmd in ["vdi_detach", "vdi_activate", "vdi_deactivate", "nop"]:
-        #     return
-
         if not is_master:
             raise xs_errors.XenError(
-                "SRUnavailable", opterr="Critical journals are pending, please run a scan"
+                "SRUnavailable", opterr="Critical journals are pending, please run a scan."
             )
 
         self._check_o_direct()
@@ -544,6 +541,7 @@ def _rollback_revert_vdi(self, entry: RevertLogEntry):
         src.sm_config = src.session.xenapi.VDI.get_sm_config(src_ref)
         src.load_from_file(str(src.path))
         src._db_update()
+        src.disable_leaf_on_secondary(src.uuid)
 
         self.added_vdi(src)
 
@@ -560,7 +558,9 @@ def _rollback_revert_vdi(self, entry: RevertLogEntry):
         if util.ioretry(lambda: util.pathexists(entry.inserted.path)):
             inserted: "FileVDI" = self.vdi(entry.inserted.uuid) # type: ignore[assignment]
             inserted._mark_hidden(entry.inserted.path)
-            inserted._db_update_or_introduce()
+            inserted_ref = inserted._db_update_or_introduce()
+            inserted.session.xenapi.VDI.set_managed(inserted_ref, False)
+            inserted.disable_leaf_on_secondary(inserted.uuid)
 
         # Once we move the backup to it's old name, the journal can't be run again
         # If something fails from now, we might lose some info, most of them
@@ -575,6 +575,8 @@ def _rollback_revert_vdi(self, entry: RevertLogEntry):
 
         dest.load_from_file(dest.path)
         dest._db_update()
+        if dest.parent:
+            dest.disable_leaf_on_secondary(dest.parent)
         self.added_vdi(dest)
 
         # CBT might have been added when not needed or removed when needed
@@ -1049,6 +1051,10 @@ def _revert(
         journal_id, journal_content = log_entry.to_journal()
         self.sr.journaler.create(log_entry.JRN_KEY, journal_id, journal_content)
 
+        # Protect dest's parent against coalesce
+        if dest.parent:
+            dest.disable_leaf_on_secondary(dest.parent, True)
+
         ## First move the old vdi to a backup location to allow rolling back
         ## This has to be done first because it's used as a signal to the rollback
         ## algorithm to know if there is cleanup work to do
@@ -1057,6 +1063,9 @@ def _revert(
             errlist=[errno.EIO, errno.EACCES],
         )
 
+        # Protect src against coalesce
+        self.disable_leaf_on_secondary(self.uuid, True)
+
         # Transform src into inserted
         self._rename(self.path, inserted_path)
 
@@ -1073,10 +1082,13 @@ def _revert(
             inserted.sm_config["key_hash"] = self.sm_config["key_hash"]
         inserted.cbt_enabled = False # Base copies don't have cbt
 
-        inserted._db_introduce()
+        inserted_ref = inserted._db_introduce()
 
         util.fistpoint.activate("FileSR_revert_create_src", self.sr.uuid)
 
+        # Protect inserted against coalesce
+        inserted.disable_leaf_on_secondary(inserted.uuid, True)
+
         # Create src again
         util.ioretry(
             lambda: self._snap(
@@ -1107,9 +1119,15 @@ def _revert(
 
         ## The new parent can now be set hidden and don't need to be protected by the GC
         inserted.cowutil.setHidden(inserted.path, True)
+        inserted._mark_hidden(inserted.path)
+        self.session.xenapi.VDI.set_managed(inserted_ref, False)
         inserted.load_from_file(inserted.path)
 
+        ## Inprotect src
+        self.disable_leaf_on_secondary(self.uuid, None)
+
         inserted._db_update()
+        inserted.disable_leaf_on_secondary(inserted.uuid, None)
 
         if src_cbtlog:
             self._revert_cbt(dest)
@@ -1124,6 +1142,9 @@ def _revert(
             )
 
         # Cleanup
+        # Unprotect dest's parent against coalesce
+        if dest.parent:
+            dest.disable_leaf_on_secondary(dest.parent, None)
         self.sr._unlink_paths(dest_backup_path)
         self.sr.journaler.remove(log_entry.JRN_KEY, journal_id)
 

drivers/VDI.py

@@ -528,11 +528,11 @@ def _db_introduce(self):
 
     def _db_update_or_introduce(self):
         try:
-            self.sr.session.xenapi.VDI.get_by_uuid(self.uuid)
+            vdi_ref = self.sr.session.xenapi.VDI.get_by_uuid(self.uuid)
         except XenAPI.Failure:
-            self._db_introduce()
-            return
+            return self._db_introduce()
         self._db_update()
+        return vdi_ref
 
     def _db_forget(self):
         self.sr.forget_vdi(self.uuid)