From 2af5a96f0d7b4ffc5a93769cbbb11320dca7e1e0 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@neon.tech>
Date: Fri, 29 Jul 2022 17:22:52 +0300
Subject: [PATCH] Back off when reenqueueing delete tasks

---
 pageserver/src/storage_sync.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pageserver/src/storage_sync.rs b/pageserver/src/storage_sync.rs
index fe1ba4b5bb..c60d3dccc0 100644
--- a/pageserver/src/storage_sync.rs
+++ b/pageserver/src/storage_sync.rs
@@ -1120,7 +1120,7 @@ where
         .instrument(info_span!("download_timeline_data")),
     );
 
-    if let Some(delete_data) = batch.delete {
+    if let Some(mut delete_data) = batch.delete {
         if upload_result.is_some() {
             match validate_task_retries(delete_data, max_sync_errors)
                 .instrument(info_span!("retries_validation"))
@@ -1153,6 +1153,7 @@ where
                 }
             }
         } else {
+            delete_data.retries += 1;
             sync_queue.push(sync_id, SyncTask::Delete(delete_data));
             warn!("Skipping delete task due to failed upload tasks, reenqueuing");
         }