pg.ddx.io  pgdogdev/pgdog GitHub issues and pull requests  
help / color / mirror / Atom feed
[pgdogdev/pgdog] PR #2068: fix: extra ReadyForQuery in shard key update transaction
6+ messages / 3 participants
[nested] [flat]

* [pgdogdev/pgdog] PR #2068: fix: extra ReadyForQuery in shard key update transaction
@ 2026-11-18 22:19 "levkk (@levkk)" <noreply+levkk@github.com>
  0 siblings, 0 replies; 6+ messages in thread

From: levkk (@levkk) @ 2026-11-18 22:19 UTC (permalink / raw)
  To: pgdogdev/pgdog <noreply+pgdogdev-pgdog@github.com>

fix #2057

We weren't draining servers when an error was returned during a sharding key update. This caused them to send the remaining `ReadyForQuery` on the following request.

inline patch 1: pgdog/src/frontend/client/query_engine/multi_step/test/update.rs, pgdog/src/frontend/client/query_engine/multi_step/update.rs (+129/-0 lines) download inline-1.patchdiff --git a/pgdog/src/frontend/client/query_engine/multi_step/test/update.rs b/pgdog/src/frontend/client/query_engine/multi_step/test/update.rs index 4676f168d..795905792 100644 --- a/pgdog/src/frontend/client/query_engine/multi_step/test/update.rs +++ b/pgdog/src/frontend/client/query_engine/multi_step/test/update.rs @@ -347,6 +347,127 @@ async fn test_move_rows_simple() { }); } +async fn failed_move_recovers(predicate: &str, expected_error: &str) { + let mut client = TestClient::new_rewrites(Parameters::default()).await; + + for extended in [false, true] { + for returning in ["", " RETURNING id"] { + let source = client.random_id_for_shard(0); + let destination = client.random_id_for_shard(1); + + for query in [ + "BEGIN".to_owned(), + format!("INSERT INTO sharded (id) VALUES ({source}), ({destination})"), + "SAVEPOINT move".to_owned(), + ] { + client.send_simple(Query::new(query)).await; + client.read_until('Z').await.expect("setup succeeds"); + } + + if extended { + client + .send(Parse::new_anonymous(&format!( + "UPDATE sharded SET id = $1 WHERE id = $2{predicate}{returning}" + ))) + .await; + client + .send(Bind::new_params( + "", + &[ + Parameter::new(destination.to_string().as_bytes()), + Parameter::new(source.to_string().as_bytes()), + ], + )) + .await; + client.send(Execute::new()).await; + client.send(Sync).await; + client + .try_process() + .await + .expect("recoverable update error"); + } else { + client + .send_simple(Query::new(format!( + "UPDATE sharded SET id = {destination} WHERE id = {source}{predicate}{returning}" + ))) + .await; + } + + let reply = client.read_until('E').await.expect("update error"); + let error = + expect_message!(reply.last().expect("error response").clone(), ErrorResponse); + assert!(error.message.contains(expected_error), "{error:?}"); + assert_eq!( + expect_message!(client.read().await, ReadyForQuery).status, + 'E' + ); + assert!( + !client.engine.backend.has_more_messages(), + "internal query responses must be drained before reporting the error" + ); + assert!(client.client.transaction.expect("open transaction").error()); + + // Each following response must start with its own CommandComplete, + // without a leftover ReadyForQuery from the failed internal query. + for (query, command, status) in [ + ("ROLLBACK TO SAVEPOINT move".to_owned(), "ROLLBACK", 'T'), + ( + format!("DELETE FROM sharded WHERE id = {source}"), + "DELETE 1", + 'T', + ), + ("COMMIT".to_owned(), "COMMIT", 'I'), + ] { + client.send_simple(Query::new(query)).await; + assert_eq!( + expect_message!(client.read().await, CommandComplete).command(), + command + ); + assert_eq!( + expect_message!(client.read().await, ReadyForQuery).status, + status + ); + assert!( + !client + .client + .transaction + .is_some_and(|transaction| transaction.error()) + ); + } + + client + .send_simple(Query::new(format!( + "SELECT id FROM sharded WHERE id IN ({source}, {destination})" + ))) + .await; + expect_message!(client.read().await, RowDescription); + assert_eq!( + expect_message!(client.read().await, DataRow).get::<i64>(0, Format::Text), + Some(destination) + ); + expect_message!(client.read().await, CommandComplete); + expect_message!(client.read().await, ReadyForQuery); + + client + .send_simple(Query::new(format!( + "DELETE FROM sharded WHERE id = {destination}" + ))) + .await; + client.read_until('Z').await.expect("cleanup succeeds"); + } + } +} + +#[tokio::test] +async fn test_failed_move_insert_recovers() { + failed_move_recovers("", "23505").await; +} + +#[tokio::test] +async fn test_failed_move_delete_recovers() { + failed_move_recovers(" AND nonexistent_update_column = 1", "42703").await; +} + #[tokio::test] async fn test_move_rows_extended() { let mut client = TestClient::new_rewrites(Parameters::default()).await; diff --git a/pgdog/src/frontend/client/query_engine/multi_step/update.rs b/pgdog/src/frontend/client/query_engine/multi_step/update.rs index da56b4024..fbd65b1b0 100644 --- a/pgdog/src/frontend/client/query_engine/multi_step/update.rs +++ b/pgdog/src/frontend/client/query_engine/multi_step/update.rs @@ -41,6 +41,14 @@ impl<'a> UpdateMulti<'a> { Err(err) => { // These are recoverable with a ROLLBACK. if matches!(err, Error::Update(_) | Error::Execution(_)) { + // Drain backends and set transaction error state. + while self.engine.backend.has_more_messages() { + self.engine.read_server_message().await?; + } + if let Some(transaction) = context.transaction.as_mut() { + transaction.set_error(); + } + self.engine .error_response(context, client_request, ErrorResponse::from_err(&err)) .await?;
^ permalink raw [nested|flat] 6+ messages in thread

* Re: [pgdogdev/pgdog] PR #2068: fix: extra ReadyForQuery in shard key update transaction
@ 2026-11-18 22:19 ` "levkk (@levkk)" <noreply+levkk@github.com>
  4 siblings, 0 replies; 6+ messages in thread

From: levkk (@levkk) @ 2026-11-18 22:19 UTC (permalink / raw)
  To: pgdogdev/pgdog <noreply+pgdogdev-pgdog@github.com>

@levkk renamed this.

^ permalink  raw  [nested|flat] 6+ messages in thread

* Re: [pgdogdev/pgdog] PR #2068: fix: extra ReadyForQuery in shard key update transaction
@ 2026-11-18 22:23 ` "codecov[bot] (bot) (@codecov[bot])" <noreply+codecov[bot]@github.com>
  4 siblings, 0 replies; 6+ messages in thread

From: codecov[bot] (bot) (@codecov[bot]) @ 2026-11-18 22:23 UTC (permalink / raw)
  To: pgdogdev/pgdog <noreply+pgdogdev-pgdog@github.com>

## [Codecov](https://app.codecov.io/gh/pgdogdev/pgdog/pull/2068?dropdown=coverage&src=pr&el=h1&utm_me...) Report
:white_check_mark: All modified and coverable lines are covered by tests.

:loudspeaker: Thoughts on this report? [Let us know!](https://github.com/codecov/feedback/issues/255)

^ permalink  raw  [nested|flat] 6+ messages in thread

* Re: [pgdogdev/pgdog] PR #2068: fix: extra ReadyForQuery in shard key update transaction
@ 2026-11-18 22:25 ` "levkk (@levkk)" <noreply+levkk@github.com>
  4 siblings, 0 replies; 6+ messages in thread

From: levkk (@levkk) @ 2026-11-18 22:25 UTC (permalink / raw)
  To: pgdogdev/pgdog <noreply+pgdogdev-pgdog@github.com>

@levkk closed this.

^ permalink  raw  [nested|flat] 6+ messages in thread

* Re: [pgdogdev/pgdog] PR #2068: fix: extra ReadyForQuery in shard key update transaction
@ 2026-11-18 22:25 ` "levkk (@levkk)" <noreply+levkk@github.com>
  4 siblings, 0 replies; 6+ messages in thread

From: levkk (@levkk) @ 2026-11-18 22:25 UTC (permalink / raw)
  To: pgdogdev/pgdog <noreply+pgdogdev-pgdog@github.com>

@levkk merged this (commit 03f27bfae49c).

^ permalink  raw  [nested|flat] 6+ messages in thread

* Re: [pgdogdev/pgdog] PR #2068: fix: extra ReadyForQuery in shard key update transaction
@ 2026-11-18 23:01 ` "github-actions[bot] (bot) (@github-actions[bot])" <noreply+github-actions[bot]@github.com>
  4 siblings, 0 replies; 6+ messages in thread

From: github-actions[bot] (bot) (@github-actions[bot]) @ 2026-11-18 23:01 UTC (permalink / raw)
  To: pgdogdev/pgdog <noreply+pgdogdev-pgdog@github.com>

<!-- metal-bench -->

**Metal bench (arm64) passed.** All 520 measures within bounds.

| suite | throughput | cpu/txn | user cycles/txn | user instr/txn | kernel cycles/txn | kernel instr/txn | ctx/txn |
|---|---|---|---|---|---|---|---|
| pooler |  | 18.83 (-1.1% ± 0.7%) | 17,723 (+0.0% ± 0.4%) | 31,393 (+0.0% ± 0.03%) | 30,416 (-1.9% ± 1.3%) | 51,143 (+0.2% ± 0.4%) |  |
| lb |  | 19.55 (-0.4% ± 2.4%) | 18,385 (+0.3% ± 1.1%) | 32,295 (-0.0% ± 0.04%) | 31,430 (-0.9% ± 4.1%) | 52,088 (-0.0% ± 0.4%) |  |
| sharding-w2 |  | 32.54 (+0.4% ± 1.9%) | 43,635 (+0.3% ± 2.0%) | 94,904 (-0.0% ± 0.01%) | 40,883 (+0.5% ± 2.3%) | 53,707 (+0.0% ± 0.3%) | 1.55 (+0.0% ± 0.2%) |
| sharding-w8 | 244,025 (-0.4% ± 0.4%) | 29.19 (+0.2% ± 0.5%) | 44,332 (+0.9% ± 0.9%) | 50,473 (+0.0% ± 0.07%) | 36,262 (-0.6% ± 0.3%) | 42,407 (+0.0% ± 0.2%) | 0.1699 (+0.1% ± 2.4%) |

<details><summary>Counters per txn</summary>

| suite | frontend stall | l1i refill | backend stall |
|---|---|---|---|
| pooler | 7,386 (-0.3% ± 1.3%) | 2,646 (+0.2% ± 0.4%) |  |
| lb | 7,823 (+0.5% ± 3.7%) | 2,705 (+0.3% ± 1.2%) |  |
| sharding-w2 | 18,001 (+0.4% ± 4.8%) | 4,136 (+0.4% ± 2.3%) |  |
| sharding-w8 | 19,848 (+2.9% ± 6.7%) | 4,050 (+1.4% ± 2.5%) |  |
</details>

Microbench: all 507 measures within bounds.

<details><summary>Microbench latency: 1 benches changed more than 3%</summary>

| benchmark | latency | baseline | change | instructions change |
|---|---|---|---|---|
| full_simple::order_limit_offset | 28,558 ns | 27,520 ns | +3.78% ± 2.10% | +0.00% ± 0.00% |
</details>

<details><summary>Hot code per txn</summary>

| path | base | head | change |
|---|---|---|---|
| pooler | 113.8 KB | 113.4 KB | **-0.3 KB** |
| sharding-w2 | 168.0 KB | 167.1 KB | **-0.9 KB** |

pooler:

| crate | base | head | change |
|---|---|---|---|
| pgdog::frontend::client::query_engine | 20.2 KB | 20.1 KB | -0.1 KB |
| tokio | 18.5 KB | 18.3 KB | -0.2 KB |
| pgdog::backend::pool | 17.4 KB | 17.7 KB | +0.2 KB |
| aws-lc (TLS crypto) | 10.3 KB | 10.0 KB | -0.3 KB |
| rustls (TLS) | 8.5 KB | 8.3 KB | -0.2 KB |
| pgdog::frontend (other) | 7.9 KB | 7.8 KB | -0.1 KB |
| pgdog::backend::server | 7.7 KB | 7.8 KB | +0.1 KB |
| other | 6.1 KB | 6.1 KB | +0.0 KB |
| everything else | 17.1 KB | 17.3 KB | +0.2 KB |

| function | head | change |
|---|---|---|
| `pgdog::frontend::client::Client::run::{{closure}}` | 5.5 KB | -0.1 KB |
| `pgdog::frontend::client::query_engine::query::<impl pgdog::frontend::client::query_engine:` | 5.2 KB | -0.1 KB |
| `pgdog::frontend::client::query_engine::QueryEngine::handle::{{closure}}` | 4.1 KB | +0.0 KB |
| `pgdog::frontend::client::query_engine::query::<impl pgdog::frontend::client::query_engine:` | 3.4 KB | +0.0 KB |
| `tokio::runtime::task::raw::poll` | 3.1 KB | -0.1 KB |

sharding-w2:

| crate | base | head | change |
|---|---|---|---|
| pgdog::frontend::router | 29.1 KB | 28.8 KB | -0.3 KB |
| pgdog::frontend::client::query_engine | 21.1 KB | 21.1 KB | +0.1 KB |
| tokio | 18.6 KB | 18.7 KB | +0.1 KB |
| pgdog::backend::pool | 18.0 KB | 17.9 KB | -0.1 KB |
| aws-lc (TLS crypto) | 13.4 KB | 12.8 KB | -0.6 KB |
| other | 9.9 KB | 10.2 KB | +0.4 KB |
| pgdog::frontend (other) | 8.9 KB | 8.9 KB | -0.1 KB |
| pgdog::backend::server | 8.1 KB | 8.0 KB | -0.1 KB |
| everything else | 40.9 KB | 40.7 KB | -0.2 KB |

| function | head | change |
|---|---|---|
| `pgdog::frontend::client::Client::run::{{closure}}` | 6.4 KB | -0.1 KB |
| `pgdog::frontend::client::query_engine::query::<impl pgdog::frontend::client::query_engine:` | 5.2 KB | +0.1 KB |
| `pgdog::frontend::client::query_engine::QueryEngine::handle::{{closure}}` | 3.9 KB | -0.1 KB |
| `tokio::runtime::task::raw::poll` | 3.2 KB | +0.1 KB |
| `pgdog::frontend::router::parser::query::select::<impl pgdog::frontend::router::parser::que` | 3.2 KB | -0.1 KB |

</details>

<details><summary>lb flamegraph vs 068e28fd</summary>

![lb](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...)

[Open interactive](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...) for hover, zoom and search.

![lb removed](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...)

[Open interactive](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...).
</details>
<details><summary>microbench flamegraph vs 068e28fd</summary>

![microbench](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...)

[Open interactive](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...) for hover, zoom and search.

![microbench removed](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...)

[Open interactive](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...).
</details>
<details><summary>pooler flamegraph vs 068e28fd</summary>

![pooler](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...)

[Open interactive](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...) for hover, zoom and search.

![pooler removed](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...)

[Open interactive](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...).
</details>
<details><summary>sharding-w2 flamegraph vs 068e28fd</summary>

![sharding-w2](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...)

[Open interactive](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...) for hover, zoom and search.

![sharding-w2 removed](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...)

[Open interactive](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...).
</details>
<details><summary>sharding-w8 flamegraph vs 068e28fd</summary>

![sharding-w8](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...)

[Open interactive](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...) for hover, zoom and search.

![sharding-w8 removed](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...)

[Open interactive](https://pgdog-metal-bench.s3.amazonaws.com/results/levkk-fix-extra-rfq/57e929b16a5acf964a48abe09d18f...).
</details>

<details><summary>Logs</summary>

[lb](https://s3.console.aws.amazon.com/s3/object/pgdog-metal-bench?prefix=results/levkk-fix-extra-rfq/57e...), [microbench](https://s3.console.aws.amazon.com/s3/object/pgdog-metal-bench?prefix=results/levkk-fix-extra-rfq/57e...), [pooler](https://s3.console.aws.amazon.com/s3/object/pgdog-metal-bench?prefix=results/levkk-fix-extra-rfq/57e...), [sharding-w2](https://s3.console.aws.amazon.com/s3/object/pgdog-metal-bench?prefix=results/levkk-fix-extra-rfq/57e...), [sharding-w8](https://s3.console.aws.amazon.com/s3/object/pgdog-metal-bench?prefix=results/levkk-fix-extra-rfq/57e...), [verdict.json](https://s3.console.aws.amazon.com/s3/object/pgdog-metal-bench?prefix=results/levkk-fix-extra-rfq/57e...)
</details>

Compared 57e929b1 with 068e28fd on c8g.metal-24xl (spot).


^ permalink  raw  [nested|flat] 6+ messages in thread


end of thread, other threads:[~2026-11-18 23:01 UTC | newest]

Thread overview: 6+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2026-11-18 22:19 [pgdogdev/pgdog] PR #2068: fix: extra ReadyForQuery in shard key update transaction "levkk (@levkk)" <noreply+levkk@github.com>
2026-11-18 22:19 ` "levkk (@levkk)" <noreply+levkk@github.com>
2026-11-18 22:23 ` "codecov[bot] (bot) (@codecov[bot])" <noreply+codecov[bot]@github.com>
2026-11-18 22:25 ` "levkk (@levkk)" <noreply+levkk@github.com>
2026-11-18 22:25 ` "levkk (@levkk)" <noreply+levkk@github.com>
2026-11-18 23:01 ` "github-actions[bot] (bot) (@github-actions[bot])" <noreply+github-actions[bot]@github.com>

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox