fix syncer requeue

KusionStack · Jan 10, 2024 · 0cb0016 · 0cb0016
1 parent 27e91d6
commit 0cb0016
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/pkg/syncer/syncer.go b/pkg/syncer/syncer.go
@@ -201,8 +201,8 @@ func (s *ResourceSyncer) processNextWorkItem(ctx context.Context) bool {
 		}
 
 		if err := s.sync(ctx, key); err != nil {
-			s.queue.AddRateLimited(key)
-			return fmt.Errorf("error syncing '%s/%s': %s, requeuing", s.source.SyncRule().Resource, key, err.Error())
+			s.queue.AddAfter(key, 5*time.Second)
+			return errors.Wrapf(err, "error syncing '%s/%s', requeuing", s.source.SyncRule().Resource, key)
 		}
 
 		s.queue.Forget(obj)
@@ -235,7 +235,11 @@ func (s *ResourceSyncer) sync(ctx context.Context, key string) error {
 		err = s.storage.Save(ctx, cluster, obj)
 	}
 	if err != nil {
-		return err
+		op := "save"
+		if isDeleted {
+			op = "delete"
+		}
+		return errors.Wrapf(err, "failed to %s from storage", op)
 	}
 
 	// obj was successfully processed, remove it from cache