apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-05-25 19:15:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1107 from MODSetter/dev

Browse source 
chore: optimize zero publication column migration process
This commit is contained in:
Rohan Verma 2026-04-02 20:40:04 -07:00 • committed by GitHub
commit c2bd2bc935
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

29
surfsense_backend/alembic/versions/117_optimize_zero_publication_column_lists.py
View file

@ -11,10 +11,11 @@ to FULL for the old Electric SQL setup (migration 66/75/76).
With DEFAULT (primary-key) identity, column-list publications With DEFAULT (primary-key) identity, column-list publications
only need to include the PK — not every column. only need to include the PK — not every column.
After running this migration you MUST: IMPORTANT — before AND after running this migration:
1. Stop zero-cache 1. Stop zero-cache (it holds replication locks that will deadlock DDL)
2. Delete / reset the zero-cache data volume 2. Run: alembic upgrade head
3. Restart zero-cache (it will do a fresh initial sync) 3. Delete / reset the zero-cache data volume
4. Restart zero-cache (it will do a fresh initial sync)
Revision ID: 117 Revision ID: 117
Revises: 116 Revises: 116
@ -62,9 +63,29 @@ CREATE PUBLICATION {PUBLICATION_NAME} FOR TABLE
""" """
def _terminate_blocked_pids(conn, table: str) -> None:
"""Kill backends whose locks on *table* would block our AccessExclusiveLock."""
conn.execute(
sa.text(
"SELECT pg_terminate_backend(l.pid) "
"FROM pg_locks l "
"JOIN pg_class c ON c.oid = l.relation "
"WHERE c.relname = :tbl "
" AND l.pid != pg_backend_pid()"
),
{"tbl": table},
)
def upgrade() -> None: def upgrade() -> None:
conn = op.get_bind() conn = op.get_bind()
conn.execute(sa.text("SET lock_timeout = '10s'"))
for tbl in sorted(TABLES_WITH_FULL_IDENTITY):
_terminate_blocked_pids(conn, tbl)
conn.execute(sa.text(f'LOCK TABLE "{tbl}" IN ACCESS EXCLUSIVE MODE'))
for tbl in TABLES_WITH_FULL_IDENTITY: for tbl in TABLES_WITH_FULL_IDENTITY:
conn.execute(sa.text(f'ALTER TABLE "{tbl}" REPLICA IDENTITY DEFAULT')) conn.execute(sa.text(f'ALTER TABLE "{tbl}" REPLICA IDENTITY DEFAULT'))