Skip to content

Commit ceb2549

Browse files
committed
ignore warnings cancel
Signed-off-by: Alex Chi Z <[email protected]>
1 parent 0ca0bca commit ceb2549

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

pageserver/src/pgdatadir_mapping.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,9 @@ impl Timeline {
723723
v2_exists
724724
);
725725
}
726+
Err(e) if e.is_cancel() => {
727+
// Cancellation errors are fine to ignore, do not log.
728+
}
726729
Err(e) => {
727730
tracing::warn!("failed to get rel exists in v2: {e}");
728731
}
@@ -863,6 +866,9 @@ impl Timeline {
863866
rels_v2.len()
864867
);
865868
}
869+
Err(e) if e.is_cancel() => {
870+
// Cancellation errors are fine to ignore, do not log.
871+
}
866872
Err(e) => {
867873
tracing::warn!("failed to list rels in v2: {e}");
868874
}
@@ -2600,6 +2606,12 @@ impl DatadirModification<'_> {
26002606
);
26012607
}
26022608
}
2609+
Err(WalIngestError {
2610+
kind: WalIngestErrorKind::Cancelled,
2611+
..
2612+
}) => {
2613+
// Cancellation errors are fine to ignore, do not log.
2614+
}
26032615
Err(e) => {
26042616
tracing::warn!("error dropping rels: {}", e);
26052617
}

test_runner/regress/test_pg_regress.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ def post_checks(env: NeonEnv, test_output_dir: Path, db_name: str, endpoint: End
123123
def patch_tenant_conf(tenant_conf: dict[str, Any], reldir_type: str) -> dict[str, Any]:
124124
tenant_conf = tenant_conf.copy()
125125
if reldir_type == "v2":
126-
tenant_conf["rel_size_v2_enabled"] = "true"
126+
tenant_conf["rel_size_v2_enabled"] = True
127127
else:
128-
tenant_conf["rel_size_v2_enabled"] = "false"
128+
tenant_conf["rel_size_v2_enabled"] = False
129129
return tenant_conf
130130

131131

@@ -457,6 +457,14 @@ def test_tx_abort_with_many_relations(
457457
],
458458
)
459459

460+
if reldir_type == "v2":
461+
# v2-only mode instead of v1-v2 validation mode
462+
env.pageserver.http_client().timeline_patch_index_part(
463+
env.initial_tenant,
464+
env.initial_timeline,
465+
{"rel_size_migration": "migrated"},
466+
)
467+
460468
# How many relations: this number is tuned to be long enough to take tens of seconds
461469
# if the rollback code path is buggy, tripping the test's timeout.
462470
n = 5000

0 commit comments

Comments
 (0)