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

Jump to bottom

PWX-35885: Doing update on latest copy of volumesnapshotschedule to avoid update failures not happening on latest version. #1665

Merged
merged 1 commit into from
Mar 15, 2024
Merged

PWX-35885: Doing update on latest copy of volumesnapshotschedule to avoid update failures not happening on latest version. #1665

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
26 changes: 19 additions & 7 deletions pkg/snapshot/controllers/snapshotschedule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,12 @@ func (s *SnapshotScheduleController) formatVolumeSnapshotName(snapshotSchedule *
return strings.Join([]string{scheduleName, strings.ToLower(string(policyType)), time.Now().Format(nameTimeSuffixFormat)}, "-")
}

func (s *SnapshotScheduleController) startVolumeSnapshot(snapshotSchedule *stork_api.VolumeSnapshotSchedule, policyType stork_api.SchedulePolicyType) error {
func (s *SnapshotScheduleController) startVolumeSnapshot(inputSnapshotSchedule *stork_api.VolumeSnapshotSchedule, policyType stork_api.SchedulePolicyType) error {
// Get the latest copy of snapshotschedule for updating
snapshotSchedule, err := storkops.Instance().GetSnapshotSchedule(inputSnapshotSchedule.Name, inputSnapshotSchedule.Namespace)
if err != nil {
return fmt.Errorf("failed to get volumesnapshot schedule %s", inputSnapshotSchedule.Name)
}
snapshotName := s.formatVolumeSnapshotName(snapshotSchedule, policyType)
if snapshotSchedule.Status.Items == nil {
snapshotSchedule.Status.Items = make(map[stork_api.SchedulePolicyType][]*stork_api.ScheduledVolumeSnapshotStatus)
Expand All @@ -312,7 +317,7 @@ func (s *SnapshotScheduleController) startVolumeSnapshot(snapshotSchedule *stork
CreationTimestamp: meta.NewTime(schedule.GetCurrentTime()),
Status: snapv1.VolumeSnapshotConditionPending,
})
err := s.client.Update(context.TODO(), snapshotSchedule)
err = s.client.Update(context.TODO(), snapshotSchedule)
if err != nil {
return err
}
Expand Down Expand Up @@ -376,10 +381,11 @@ func (s *SnapshotScheduleController) startVolumeSnapshot(snapshotSchedule *stork
if snapshotSchedule.Spec.ReclaimPolicy == stork_api.ReclaimPolicyDelete {
snapshot.Metadata.OwnerReferences = []meta.OwnerReference{
{
Name: snapshotSchedule.Name,
UID: snapshotSchedule.UID,
Kind: snapshotSchedule.GetObjectKind().GroupVersionKind().Kind,
APIVersion: snapshotSchedule.GetObjectKind().GroupVersionKind().GroupVersion().String(),
Name: snapshotSchedule.Name,
UID: snapshotSchedule.UID,
// TODO: Kind of the fetched volumesnapshotschedule is empty, hence using the input one
Kind: inputSnapshotSchedule.GetObjectKind().GroupVersionKind().Kind,
APIVersion: inputSnapshotSchedule.GetObjectKind().GroupVersionKind().GroupVersion().String(),
},
}
}
Expand Down Expand Up @@ -465,7 +471,13 @@ func (s *SnapshotScheduleController) pruneVolumeSnapshots(snapshotSchedule *stor
}
}
if snapshotScheduleUpdateRequired {
return s.client.Update(context.TODO(), snapshotSchedule)
// Get the latest copy of snapshotschedule for updating
currentSnapshotSchedule, err := storkops.Instance().GetSnapshotSchedule(snapshotSchedule.Name, snapshotSchedule.Namespace)
if err != nil {
return fmt.Errorf("failed to get volumesnapshot schedule %s", snapshotSchedule.Name)
}
currentSnapshotSchedule.Status = snapshotSchedule.Status
return s.client.Update(context.TODO(), currentSnapshotSchedule)
}
return nil
}
Expand Down