Skip to content

Commit

Permalink
fix: also retry client errors
Browse files Browse the repository at this point in the history
Signed-off-by: Jakob Möller <jmoller@redhat.com>
  • Loading branch information
jakobmoellerdev committed Apr 26, 2024
1 parent be92bdb commit 1ebdfd5
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions internal/driver/internal/k8s/logicalvolume_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ func (s *LogicalVolumeService) DeleteVolume(ctx context.Context, volumeID string
return true, nil
}
logger.Error(err, "failed to get LogicalVolume", "name", lv.Name)
return true, err
return false, nil
}
logger.Info("waiting for LogicalVolume to be deleted", "name", lv.Name)
return false, nil
Expand Down Expand Up @@ -325,7 +325,7 @@ func (s *LogicalVolumeService) ExpandVolume(ctx context.Context, volumeID string
var changedLV topolvmv1.LogicalVolume
if err := s.getter.Get(ctx, client.ObjectKey{Name: lv.Name}, &changedLV); err != nil {
logger.Error(err, "failed to get LogicalVolume", "name", lv.Name)
return true, err
return false, nil
}

if changedLV.Status.Code != codes.OK {
Expand Down Expand Up @@ -374,11 +374,10 @@ func (s *LogicalVolumeService) updateSpecSize(ctx context.Context, volumeID stri
if err := s.writer.Update(ctx, lv); err != nil {
if apierrors.IsConflict(err) {
logger.Info("detected conflict when trying to update LogicalVolume spec", "name", lv.Name)
return false, nil
} else {
logger.Error(err, "failed to update LogicalVolume spec", "name", lv.Name)
return true, err
}
return false, nil
}
return true, nil
})
Expand All @@ -396,7 +395,7 @@ func (s *LogicalVolumeService) waitForStatusUpdate(ctx context.Context, name str
var newLV topolvmv1.LogicalVolume
if err := s.getter.Get(ctx, client.ObjectKey{Name: name}, &newLV); err != nil {
logger.Error(err, "failed to get LogicalVolume", "name", name)
return true, err
return false, nil
}
if newLV.Status.VolumeID != "" {
logger.Info("LogicalVolume successfully provisioned", "volume_id", newLV.Status.VolumeID)
Expand Down

0 comments on commit 1ebdfd5

Please sign in to comment.