Skip to content

Commit fd4d58c

Browse files
committed
remove partial snapshot test
This test provides questionable value and requires modifying code behavior deep in the dataflow to trigger the condition it wants to test. Hence it is removed. I put this as a separate commit in case we change our minds during review and want to keep it. Signed-off-by: Petros Angelatos <[email protected]>
1 parent 3c7da54 commit fd4d58c

File tree

7 files changed

+0
-183
lines changed

7 files changed

+0
-183
lines changed

src/storage/src/render/persist_sink.rs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,15 +1010,6 @@ where
10101010
let mut batch_description_frontier = Antichain::from_elem(Timestamp::minimum());
10111011
let mut batches_frontier = Antichain::from_elem(Timestamp::minimum());
10121012

1013-
// Pause the source to prevent committing the snapshot,
1014-
// if the failpoint is configured
1015-
let mut pg_snapshot_pause = false;
1016-
(|| {
1017-
fail::fail_point!("pg_snapshot_pause", |_| {
1018-
pg_snapshot_pause = true;
1019-
});
1020-
})();
1021-
10221013
loop {
10231014
tokio::select! {
10241015
Some(event) = descriptions_input.next() => {
@@ -1152,18 +1143,6 @@ where
11521143

11531144
let mut to_append = batches.iter_mut().map(|b| &mut b.batch).collect::<Vec<_>>();
11541145

1155-
// We evaluate this above to avoid checking an environment variable
1156-
// in a hot loop. Note that we only pause before we emit
1157-
// non-empty batches, because we do want to bump the upper
1158-
// with empty ones before we start ingesting the snapshot.
1159-
//
1160-
// This is a fairly complex failure case we need to check
1161-
// see `test/cluster/pg-snapshot-partial-failure` for more
1162-
// information.
1163-
if pg_snapshot_pause && !to_append.is_empty() && !batch_metrics.is_empty() {
1164-
futures::future::pending().await
1165-
}
1166-
11671146
let result = {
11681147
let maybe_err = if *read_only_rx.borrow() {
11691148

test/cluster/mzcompose.py

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1720,39 +1720,6 @@ def kill_replica_with_delay() -> None:
17201720
killer.join()
17211721

17221722

1723-
def workflow_pg_snapshot_partial_failure(c: Composition) -> None:
1724-
"""Test PostgreSQL snapshot partial failure"""
1725-
1726-
c.down(destroy_volumes=True)
1727-
1728-
with c.override(
1729-
# Start postgres for the pg source
1730-
Testdrive(no_reset=True),
1731-
Clusterd(
1732-
name="clusterd1",
1733-
environment_extra=["FAILPOINTS=pg_snapshot_pause=return(2)"],
1734-
),
1735-
):
1736-
c.up("materialized", "postgres", "clusterd1")
1737-
1738-
c.run_testdrive_files("pg-snapshot-partial-failure/01-configure-postgres.td")
1739-
c.run_testdrive_files("pg-snapshot-partial-failure/02-create-sources.td")
1740-
1741-
c.run_testdrive_files(
1742-
"pg-snapshot-partial-failure/03-verify-good-sub-source.td"
1743-
)
1744-
1745-
c.kill("clusterd1")
1746-
# Restart the storage instance with the failpoint off...
1747-
with c.override(
1748-
# turn off the failpoint
1749-
Clusterd(name="clusterd1")
1750-
):
1751-
c.run_testdrive_files("pg-snapshot-partial-failure/04-add-more-data.td")
1752-
c.up("clusterd1")
1753-
c.run_testdrive_files("pg-snapshot-partial-failure/05-verify-data.td")
1754-
1755-
17561723
def workflow_test_compute_reconciliation_reuse(c: Composition) -> None:
17571724
"""
17581725
Test that compute reconciliation reuses existing dataflows.

test/cluster/pg-snapshot-partial-failure/01-configure-postgres.td

Lines changed: 0 additions & 28 deletions
This file was deleted.

test/cluster/pg-snapshot-partial-failure/02-create-sources.td

Lines changed: 0 additions & 41 deletions
This file was deleted.

test/cluster/pg-snapshot-partial-failure/03-verify-good-sub-source.td

Lines changed: 0 additions & 25 deletions
This file was deleted.

test/cluster/pg-snapshot-partial-failure/04-add-more-data.td

Lines changed: 0 additions & 12 deletions
This file was deleted.

test/cluster/pg-snapshot-partial-failure/05-verify-data.td

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)