Skip to content

REL_2_STABLE: Fix binary swap test failure on PG version bump#1634

Merged
x4m merged 3 commits intoapache:REL_2_STABLEfrom
tuhaihe:fix-abi-check-REL2
Mar 23, 2026
Merged

REL_2_STABLE: Fix binary swap test failure on PG version bump#1634
x4m merged 3 commits intoapache:REL_2_STABLEfrom
tuhaihe:fix-abi-check-REL2

Conversation

@tuhaihe
Copy link
Member

@tuhaihe tuhaihe commented Mar 23, 2026

Fixes #ISSUE_Number

What does this PR do?

Type of Change

  • Bug fix (non-breaking change)
  • New feature (non-breaking change)
  • Breaking change (fix or feature with breaking changes)
  • Documentation update

Breaking Changes

Test Plan

  • Unit tests added/updated
  • Integration tests added/updated
  • Passed make installcheck
  • Passed make -C src/test installcheck-cbdb-parallel

Impact

Performance:

User-facing changes:

Dependencies:

Checklist

Additional Context

CI Skip Instructions


tuhaihe added 2 commits March 23, 2026 15:03
The binary swap test compares pg_dump outputs between baseline and
current builds using a plain diff. When upgrading the PG kernel minor
version (e.g. 14.4 to 14.5), the "-- Dumped from database version"
comment line in pg_dump output differs between the two builds, causing
a false test failure.

Add the `-I` flag with a regex pattern to the diff command in
diff_dumps.sql so that comment-only version lines are ignored during
comparison. This preserves detection of any real catalog, schema, or
data incompatibilities while allowing PG minor version bumps without
breaking the binary swap CI check.
@tuhaihe tuhaihe force-pushed the fix-abi-check-REL2 branch from e293e50 to c1014a3 Compare March 23, 2026 07:10
Copy link
Contributor

@reshke reshke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, thats good.

The binary swap workflow previously only reported catalog version
information when comparing baseline and current builds. This made it
difficult to see at a glance which PostgreSQL kernel minor version
each build was based on.

Extract the underlying PostgreSQL kernel version from both baseline
and current installs via `pg_config --version`. Display the comparison
in the terminal log alongside the existing catalog version check, and
include it in the GitHub Step Summary report for better visibility
during PG minor version upgrades (e.g. 14.4 to 14.5).
@tuhaihe
Copy link
Member Author

tuhaihe commented Mar 23, 2026

As discussed in PR #1621, we are upgrading the Postgres minor kernel version to align with the upstream release, providing developers and users with better visibility into the base kernel changes.

@tuhaihe tuhaihe requested a review from leborchuk March 23, 2026 09:25
@x4m x4m merged commit 04c009d into apache:REL_2_STABLE Mar 23, 2026
49 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants