Skip to content

PXC-5276 [9.7] Merge branch '9.7' into release-9.7.2-2 - #2400

Closed
jaideepkarande wants to merge 8 commits into
percona:release-9.7.2-2from
jaideepkarande:PXC-5276-9.7-merge-9.7-into-release-9.7.2-2
Closed

jaideepkarande wants to merge 8 commits into
percona:release-9.7.2-2from
jaideepkarande:PXC-5276-9.7-merge-9.7-into-release-9.7.2-2

Conversation

@jaideepkarande

Copy link
Copy Markdown
Contributor

PXC-5276 [9.7] Merge branch '9.7' into release-9.7.2-2

https://perconadev.atlassian.net/browse/PXC-5276

Unblocks #2398 (release-9.7.2-2 → 9.7), which is CONFLICTING.

Brings the 9.7 commits made after release-9.7.2-2 was cut into the release branch: PXC-5355, PXC-5203, PXC-5140, PXC-5229.

Conflict resolution

Only azure-pipelines.yml conflicted:

  • 9.7 (PXC-5355): commented out both macOS 14 legs. The macOS-14 hosted image was removed on 2026-11-02, and PXC cannot be built on macOS (Galera's gu_threads.h requires __unix__).
  • release-9.7.2-2 (PS-11473, from the PS 9.7.2-2 merge): restructured the matrix into 5 default configs, with all other legs, macOS included, gated on fullCI or the nightly schedule.

Resolution: keep the PS-11473 layout and comment out its two macOS legs, preserving PXC-5355. Without this, every nightly and every fullCI run would fail on the macOS legs. Compared with release-9.7.2-2, the only change in this file is that commented-out block. The rest of the merge applied cleanly.

Test plan

  • Merge of 9.7 into release-9.7.2-2 has a single conflict (azure-pipelines.yml), resolved as above
  • Resolved azure-pipelines.yml parses as valid YAML
  • Azure Pipelines run on this PR is green (5 default Linux configs, no macOS legs)
  • After merging, PXC-5276 [9.7] Packaging tasks for release - PXC 9.7.2 #2398 shows as mergeable

🤖 Generated with Claude Code

jaideepkarande and others added 8 commits October 13, 2026 15:44
…R BACKUP misuse

https://perconadev.atlassian.net/browse/PXC-5203

A session that ran its own DDL/DML while holding LOCK TABLES FOR BACKUP
was replicated via TOI before the local backup-lock check rejected it,
so peers applied the DDL while the originator failed it locally -- causing
a Galera "inconsistency detected" vote and node eviction.

Resolution:
Similar issue was already fixed for "LOCK INSTANCE FOR BACKUP" extended the
condition for "LOCK TABLES FOR BACKUP"
https://perconadev.atlassian.net/browse/PXC-5355

The macOS-14 hosted image is deprecated: jobs using it fail during the
brownouts that started on 2026-10-05, and the image is removed on
2026-11-02. On 9.7, macOS 14 RelWithDebInfo runs on every pull request, so every PR
run fails during a brownout and would fail permanently after the
removal.

Percona Server moved its macOS legs to macOS-15 (PS-11625), but PXC
cannot follow: PXC can't be built on macOS at all. Galera is built as
part of the PXC cmake build since PXC-4186, and galerautils'
gu_threads.h maps its thread types only under `#if __unix__`, which
Apple clang does not define, so compiling Galera fails with "unknown
type name 'gu_mutex_t_SYS'". The macOS legs were dropped from PXC once
before, in PXC-4221 (2023), and came back with the release-8.0.33
merge; they have not been able to build PXC since.

Comment out both macOS 14 legs (RelWithDebInfo and Debug), as Percona
Server did on 8.0. The Darwin branches in the build steps are kept, so
the legs can be re-enabled by uncommenting them if Galera is ever
ported to macOS.
…_primary_key is turned OFF globally

https://perconadev.atlassian.net/browse/PXC-5140

Problem:
sql_generate_invisible_primary_key is a session variable. During wsrep
TOI, DDL is replicated as raw statement text without the originating
session's variable state. Consequently, a PK-less CREATE TABLE can
produce different table definitions across nodes when the global
setting is OFF. ALTER TABLE operations can also fail to apply when
applier session settings differ from the originating node.

Description:
WSREP TOI does not preserve session variables that affect DDL execution.
Applier threads may also retain stale values inherited from their
creation-time global settings, causing inconsistent behavior when global
settings change.

Resolution:
Introduce WSREP_SESSION_FLAGS_EVENT, a wsrep-private Intvar control
event carrying a bitmask of session flags that affect replicated DDL.
Propagate the originating session's effective setting for
CREATE TABLE, ALTER TABLE, CREATE INDEX, and DROP INDEX.
Apply the event in the Intvar apply path alongside the existing
wsrep BINLOG_CONTROL_EVENT, so the session state is in place when the
associated DDL executes.
Re-seed applier session variables from the current global settings
for each write set.

Preserve compatibility: no on-disk, wire, or wsrep protocol changes;
older nodes ignore the event and retain existing behavior.
PXC-5355 [9.7] Disable Azure Pipelines macOS legs
[9.7]PXC-5203: Cluster disruption or deadlock with LOCK TABLES/INSTANCE FOR BACKUP misuse
[9.7]PXC-5140: Invisible PK is generated even after sql_generate_invisible_primary_key is turned OFF globally
https://perconadev.atlassian.net/browse/PXC-5276

Bring the 9.7 commits made after release-9.7.2-2 was cut (PXC-5355,
PXC-5203, PXC-5140, PXC-5229) into the release branch, so the release
PR percona#2398 into 9.7 is no longer conflicting.

Conflict in azure-pipelines.yml: PXC-5355 commented out the macOS 14
legs on 9.7, while PS-11473 (from the PS 9.7.2-2 merge) restructured
the matrix and made the macOS legs fullCI/nightly-only. Keep the
PS-11473 layout and comment out its macOS legs, preserving PXC-5355:
the macOS-14 image has been removed and PXC cannot be built on macOS.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@jaideepkarande
jaideepkarande requested review from adivinho and inikep and removed request for adivinho and inikep November 11, 2026 11:47
@jaideepkarande

Copy link
Copy Markdown
Contributor Author

Closing: merging 9.7 into release-9.7.2-2 would pull PXC-5140 and PXC-5203 into the 9.7.2 release, which is out of scope. Instead, PXC-5355 is being reverted on 9.7 so the release can merge cleanly; the macOS legs will be disabled again in a follow-up PR afterwards.

@jaideepkarande
jaideepkarande deleted the PXC-5276-9.7-merge-9.7-into-release-9.7.2-2 branch November 11, 2026 17:53
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.

2 participants