rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-18 13:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Put back spans that were lost along with 'immediate_compact'.

Browse Source
This commit is contained in:
Heikki Linnakangas
2023-01-12 22:49:00 +02:00
parent 867b35ce55
commit 292c42731e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pageserver/src/http/routes.rs
View File

@@ -814,6 +814,7 @@ async fn timeline_compact_handler(request: Request<Body>) -> Result<Response<Bod
.map_err(ApiError::NotFound)?;
timeline
.compact(&ctx)
.instrument(info_span!("manual_compact", tenant = %tenant_id, timeline = %timeline_id))
.await
.map_err(ApiError::InternalServerError)?;
@@ -841,6 +842,7 @@ async fn timeline_checkpoint_handler(request: Request<Body>) -> Result<Response<
.map_err(ApiError::InternalServerError)?;
timeline
.compact(&ctx)
.instrument(info_span!("manual_compact", tenant = %tenant_id, timeline = %timeline_id))
.await
.map_err(ApiError::InternalServerError)?;

2
test_runner/fixtures/neon_fixtures.py
View File

@@ -1945,7 +1945,7 @@ class NeonPageserver(PgProtocol):
# Tenant::delete_timeline() can cause any of the four following errors.
# FIXME: we shouldn't be considering it an error: https://github.com/neondatabase/neon/issues/2946
".*could not flush frozen layer.*queue is in state Stopped", # when schedule layer upload fails because queued got closed before compaction got killed
".*Compaction failed, .* queue is in state Stopped.*", # similarly for compaction
".*Compaction failed, .* queue is in state Stopped.*", # similarly for compaction
".*wait for layer upload ops to complete.*", # .*Caused by:.*wait_completion aborted because upload queue was stopped
".*gc_loop.*Gc failed, retrying in.*timeline is Stopping", # When gc checks timeline state after acquiring layer_removal_cs
".*compaction_loop.*Compaction failed, retrying in.*timeline is Stopping", # When compaction checks timeline state after acquiring layer_removal_cs