rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-15 09:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

pageserver: generalize flush API

Browse Source
This commit is contained in:
John Spray
2023-08-17 10:01:28 +01:00
parent 8eaa4015de
commit c36cba28d6
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pageserver/src/http/openapi_spec.yml
View File

@@ -52,7 +52,15 @@ paths:
schema:
type: object
/v1/deletion_queue/flush_execute:
/v1/deletion_queue/flush:
parameters:
- name: execute
in: query
required: false
schema:
type: boolean
description:
If true, attempt to execute deletions. If false, just flush deletions to persistent deletion lists.
put:
description: Execute any deletions currently enqueued
security: []

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

@@ -1132,7 +1132,7 @@ async fn always_panic_handler(
json_response(StatusCode::NO_CONTENT, ())
}
async fn deletion_queue_flush_execute(
async fn deletion_queue_flush(
r: Request<Body>,
cancel: CancellationToken,
) -> Result<Response<Body>, ApiError> {
@@ -1143,9 +1143,18 @@ async fn deletion_queue_flush_execute(
return json_response(StatusCode::OK, ());
}
let execute = parse_query_param(&r, "execute")?.unwrap_or(false);
let queue_client = state.deletion_queue.new_client();
tokio::select! {
_ = queue_client.flush_execute()=> {
_ = async {
if execute {
queue_client.flush_execute().await;
} else {
queue_client.flush().await;
}
} => {
json_response(StatusCode::OK, ())
},
_ = cancel.cancelled() => {
@@ -1478,8 +1487,8 @@ pub fn make_router(
.put("/v1/disk_usage_eviction/run", |r| {
api_handler(r, disk_usage_eviction_run)
})
.put("/v1/deletion_queue/flush_execute", |r| {
api_handler(r, deletion_queue_flush_execute)
.put("/v1/deletion_queue/flush", |r| {
api_handler(r, deletion_queue_flush)
})
.put("/v1/tenant/:tenant_id/break", |r| {
testing_api_handler("set tenant state to broken", r, handle_tenant_break)