Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OADP-849: Fix race conditions in VSR controller #165

Merged
merged 1 commit into from
Nov 2, 2022
Merged

OADP-849: Fix race conditions in VSR controller #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions controllers/replicationdestination.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,21 @@ func (r *VolumeSnapshotRestoreReconciler) CreateReplicationDestination(log logr.
},
}

// get restic secret created by controller
dmresticSecretName := fmt.Sprintf("%s-secret", vsr.Name)
resticSecret := corev1.Secret{}
if err := r.Get(r.Context, types.NamespacedName{Namespace: r.NamespacedName.Namespace, Name: dmresticSecretName}, &resticSecret); err != nil {
if k8serrors.IsNotFound(err) {
return false, nil
}
r.Log.Error(err, fmt.Sprintf("unable to fetch restic secret %s/%s", r.NamespacedName.Namespace, dmresticSecretName))
return false, err
}

// Create ReplicationDestination in protected namespace
op, err := controllerutil.CreateOrUpdate(r.Context, r.Client, repDestination, func() error {

return r.buildReplicationDestination(repDestination, &vsr)
return r.buildReplicationDestination(repDestination, &vsr, &resticSecret)
})
if err != nil {
return false, err
Expand All @@ -61,15 +72,7 @@ func (r *VolumeSnapshotRestoreReconciler) CreateReplicationDestination(log logr.
return true, nil
}

func (r *VolumeSnapshotRestoreReconciler) buildReplicationDestination(replicationDestination *volsyncv1alpha1.ReplicationDestination, vsr *volsnapmoverv1alpha1.VolumeSnapshotRestore) error {

// get restic secret created by controller
dmresticSecretName := fmt.Sprintf("%s-secret", vsr.Name)
resticSecret := corev1.Secret{}
if err := r.Get(r.Context, types.NamespacedName{Namespace: r.NamespacedName.Namespace, Name: dmresticSecretName}, &resticSecret); err != nil {
r.Log.Error(err, fmt.Sprintf("unable to fetch restic secret %s/%s", r.NamespacedName.Namespace, dmresticSecretName))
return err
}
func (r *VolumeSnapshotRestoreReconciler) buildReplicationDestination(replicationDestination *volsyncv1alpha1.ReplicationDestination, vsr *volsnapmoverv1alpha1.VolumeSnapshotRestore, resticSecret *corev1.Secret) error {

stringCapacity := vsr.Spec.VolumeSnapshotMoverBackupref.BackedUpPVCData.Size
capacity := resource.MustParse(stringCapacity)
Expand Down Expand Up @@ -175,7 +178,7 @@ func (r *VolumeSnapshotRestoreReconciler) SetVSRStatus(log logr.Logger) (bool, e
return false, nil

// if not in progress or completed, phase failed
} else {
} else if reconConditionProgress.Reason == volsyncv1alpha1.ReconciledReasonError {
vsr.Status.Phase = volsnapmoverv1alpha1.SnapMoverRestorePhaseFailed

err := r.Status().Update(context.Background(), &vsr)
Expand Down
7 changes: 5 additions & 2 deletions controllers/volumesnapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ func (r *VolumeSnapshotRestoreReconciler) WaitForVolSyncSnapshotContentToBeReady
return false, err
}

if vsc.Status == nil {
r.Log.Info(fmt.Sprintf("volumesnapshotcontent %s status is not set, requeueing...", vsc.Name))
if vsc == nil || vsc.Status == nil {
r.Log.Info(fmt.Sprintf("volumesnapshotcontent for vsr %s is not yet ready", vsr.Name))
return false, nil
}

Expand All @@ -300,6 +300,9 @@ func (r *VolumeSnapshotRestoreReconciler) getVolSyncSnapshotContent(vsr *volsnap
repDestName := fmt.Sprintf("%s-rep-dest", vsr.Name)
repDest := volsyncv1alpha1.ReplicationDestination{}
if err := r.Get(r.Context, types.NamespacedName{Namespace: vsr.Spec.ProtectedNamespace, Name: repDestName}, &repDest); err != nil {
if k8serrors.IsNotFound(err) {
return nil, nil
}
r.Log.Error(err, fmt.Sprintf("unable to fetch replicationdestination %s/%s", vsr.Spec.ProtectedNamespace, repDestName))
return nil, err
}
Expand Down