rbd: update namespace name in rados object

If a PV is reattached to a new PVC in a different namespace we need to update the namespace name in the rados object. Signed-off-by: Madhu Rajanna <[email protected]>
ceph · Oct 27, 2022 · 8cf4250 · 8cf4250
1 parent 5f1149b
commit 8cf4250
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/internal/journal/voljournal.go b/internal/journal/voljournal.go
@@ -864,3 +864,14 @@ func (conn *Connection) ReserveNewUUIDMapping(ctx context.Context,
 
 	return setOMapKeys(ctx, conn, journalPool, cj.namespace, cj.csiDirectory, setKeys)
 }
+
+// ResetVolumeOwner update the owner in the rados object.
+func (conn *Connection) ResetVolumeOwner(ctx context.Context, pool, reservedUUID, owner string) error {
+	err := setOMapKeys(ctx, conn, pool, conn.config.namespace, conn.config.cephUUIDDirectoryPrefix+reservedUUID,
+		map[string]string{conn.config.ownerKey: owner})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/internal/rbd/rbd_journal.go b/internal/rbd/rbd_journal.go
@@ -625,6 +625,12 @@ func RegenerateJournal(
 				return "", err
 			}
 		}
+		if rbdVol.Owner != owner {
+			err = j.ResetVolumeOwner(ctx, rbdVol.JournalPool, rbdVol.ReservedID, owner)
+			if err != nil {
+				return "", err
+			}
+		}
 		// Update Metadata on reattach of the same old PV
 		parameters := k8s.PrepareVolumeMetadata(claimName, owner, "")
 		err = rbdVol.setAllMetadata(parameters)