Skip to content

Commit 867e047

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 <petrosagg@gmail.com>
1 parent 5c5f2e9 commit 867e047

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
@@ -1026,15 +1026,6 @@ where
10261026
let mut batch_description_frontier = Antichain::from_elem(Timestamp::minimum());
10271027
let mut batches_frontier = Antichain::from_elem(Timestamp::minimum());
10281028

1029-
// Pause the source to prevent committing the snapshot,
1030-
// if the failpoint is configured
1031-
let mut pg_snapshot_pause = false;
1032-
(|| {
1033-
fail::fail_point!("pg_snapshot_pause", |_| {
1034-
pg_snapshot_pause = true;
1035-
});
1036-
})();
1037-
10381029
loop {
10391030
tokio::select! {
10401031
Some(event) = descriptions_input.next() => {
@@ -1168,18 +1159,6 @@ where
11681159

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

1171-
// We evaluate this above to avoid checking an environment variable
1172-
// in a hot loop. Note that we only pause before we emit
1173-
// non-empty batches, because we do want to bump the upper
1174-
// with empty ones before we start ingesting the snapshot.
1175-
//
1176-
// This is a fairly complex failure case we need to check
1177-
// see `test/cluster/pg-snapshot-partial-failure` for more
1178-
// information.
1179-
if pg_snapshot_pause && !to_append.is_empty() && !batch_metrics.is_empty() {
1180-
futures::future::pending().await
1181-
}
1182-
11831162
let result = {
11841163
let maybe_err = if *read_only_rx.borrow() {
11851164

test/cluster/mzcompose.py

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

17181718

1719-
def workflow_pg_snapshot_partial_failure(c: Composition) -> None:
1720-
"""Test PostgreSQL snapshot partial failure"""
1721-
1722-
c.down(destroy_volumes=True)
1723-
1724-
with c.override(
1725-
# Start postgres for the pg source
1726-
Testdrive(no_reset=True),
1727-
Clusterd(
1728-
name="clusterd1",
1729-
environment_extra=["FAILPOINTS=pg_snapshot_pause=return(2)"],
1730-
),
1731-
):
1732-
c.up("materialized", "postgres", "clusterd1")
1733-
1734-
c.run_testdrive_files("pg-snapshot-partial-failure/01-configure-postgres.td")
1735-
c.run_testdrive_files("pg-snapshot-partial-failure/02-create-sources.td")
1736-
1737-
c.run_testdrive_files(
1738-
"pg-snapshot-partial-failure/03-verify-good-sub-source.td"
1739-
)
1740-
1741-
c.kill("clusterd1")
1742-
# Restart the storage instance with the failpoint off...
1743-
with c.override(
1744-
# turn off the failpoint
1745-
Clusterd(name="clusterd1")
1746-
):
1747-
c.run_testdrive_files("pg-snapshot-partial-failure/04-add-more-data.td")
1748-
c.up("clusterd1")
1749-
c.run_testdrive_files("pg-snapshot-partial-failure/05-verify-data.td")
1750-
1751-
17521719
def workflow_test_compute_reconciliation_reuse(c: Composition) -> None:
17531720
"""
17541721
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)