diff --git a/operator/internal/controller/backuprestore_controller.go b/operator/internal/controller/backuprestore_controller.go index f81da118f..514cebeb5 100644 --- a/operator/internal/controller/backuprestore_controller.go +++ b/operator/internal/controller/backuprestore_controller.go @@ -776,7 +776,7 @@ func (r *BackupRestoreReconciler) ensurePV( } existing := &corev1.PersistentVolume{} if err := r.Get(ctx, client.ObjectKey{Name: pvName}, existing); err == nil { - wantHandle := fmt.Sprintf("%s:%s:%s", clusterUUID, restoreCR.Status.PoolName, restoreCR.Status.RestoredLvolID) + wantHandle := fmt.Sprintf("%s:%s:%s", clusterUUID, restoreCR.Status.PoolUUID, restoreCR.Status.RestoredLvolID) var mismatch string switch { case existing.Spec.StorageClassName != wantStorageClass: @@ -810,7 +810,7 @@ func (r *BackupRestoreReconciler) ensurePV( volumeHandle := fmt.Sprintf("%s:%s:%s", clusterUUID, - restoreCR.Status.PoolName, + restoreCR.Status.PoolUUID, restoreCR.Status.RestoredLvolID, ) volumeAttributes, err := r.restoreVolumeAttributes( diff --git a/operator/internal/controller/backuprestore_controller_test.go b/operator/internal/controller/backuprestore_controller_test.go index a1738b8bd..884fc51e8 100644 --- a/operator/internal/controller/backuprestore_controller_test.go +++ b/operator/internal/controller/backuprestore_controller_test.go @@ -138,7 +138,7 @@ func TestBackupRestoreEnsurePVIncludesCSIAttributes(t *testing.T) { t.Fatalf("storageClassName = %q, want %q", pv.Spec.StorageClassName, wantStorageClass) } - wantVolumeHandle := "cluster-uuid:pool-a:lvol-uuid" + wantVolumeHandle := "cluster-uuid:pool-uuid:lvol-uuid" if pv.Spec.CSI.VolumeHandle != wantVolumeHandle { t.Fatalf("volumeHandle = %q, want %q", pv.Spec.CSI.VolumeHandle, wantVolumeHandle) }