From 7f3ee0d45d55e22c08b9d0c1a9f9c87a4545f17f Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Thu, 27 Apr 2023 13:04:07 +0200 Subject: [PATCH] fix the problem exposed by the previously added test case --- pageserver/src/tenant/remote_timeline_client.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pageserver/src/tenant/remote_timeline_client.rs b/pageserver/src/tenant/remote_timeline_client.rs index 367122362e..a24d9a2076 100644 --- a/pageserver/src/tenant/remote_timeline_client.rs +++ b/pageserver/src/tenant/remote_timeline_client.rs @@ -642,10 +642,10 @@ impl RemoteTimelineClient { UploadQueue::Stopped(stopped) => stopped, }; - assert!( - stopped.last_uploaded_index_part.deleted_at.is_none(), - "deleted_at already set" - ); + if let Some(delete_dat) = stopped.last_uploaded_index_part.deleted_at.as_ref() { + // XXX deal with case where the first call is stopped being polled + anyhow::bail!("timeline is deleting, deleted_at: {:?}", delete_dat); + } stopped.last_uploaded_index_part.deleted_at = Some(Utc::now().naive_utc()); stopped.last_uploaded_index_part.clone() };