mirror of
https://github.com/ThearchyHelios/AgentLab.git
synced 2026-11-22 23:02:02 +00:00
加直连地址 AGENTLAB_DATABASE_DIRECT_URL 和 PgBouncer 事务模式开关 AGENTLAB_DB_PGBOUNCER(用户拍板):依赖会话状态的连接——收发进程间通知的那一条(LISTEN)、跨进程的锁(会话级咨询锁,另建一个直连的小池子)、断点库(缺省)——走直连地址,普通查询走 AGENTLAB_DATABASE_URL,不设就全用同一个;开关打开时普通地址不用客户端连接池、关掉 SQLAlchemy 和 asyncpg 的预备语句缓存、预备语句用随机名字(照 SQLAlchemy 文档),事务级咨询锁照常成立;开关打开却没给直连地址时拒绝启动。README 写三种部署(直连、PgBouncer 会话模式、事务模式加直连地址)和要配的 server_reset_query,照实说没在真的 PgBouncer 上跑过。补测试:地址解析和规范化、断点库缺省走直连、事务模式关掉的几样、LISTEN 和跨进程锁走直连、事务模式没给直连地址拒绝启动
This commit is contained in:
@@ -55,9 +55,9 @@ class ClusterLock:
|
||||
try:
|
||||
from sqlalchemy import text
|
||||
|
||||
from app.db.base import engine
|
||||
from app.db.base import session_engine
|
||||
|
||||
conn = await engine.connect()
|
||||
conn = await session_engine().connect()
|
||||
try:
|
||||
conn = await conn.execution_options(isolation_level="AUTOCOMMIT")
|
||||
got = bool(await conn.scalar(text("SELECT pg_try_advisory_lock(:k)"), {"k": self.key}))
|
||||
@@ -86,9 +86,11 @@ class ClusterLock:
|
||||
try:
|
||||
from sqlalchemy import text
|
||||
|
||||
from app.db.base import engine
|
||||
from app.db.base import session_engine
|
||||
|
||||
conn = await engine.connect()
|
||||
# 会话级的锁:走直连(AGENTLAB_DATABASE_DIRECT_URL,没设就是应用库)——PgBouncer 事务模式下取锁、放锁可能落在
|
||||
# 两条不同的服务端连接上
|
||||
conn = await session_engine().connect()
|
||||
try:
|
||||
conn = await conn.execution_options(isolation_level="AUTOCOMMIT")
|
||||
await conn.execute(text("SELECT pg_advisory_lock(:k)"), {"k": self.key})
|
||||
|
||||
@@ -37,6 +37,14 @@ RETRY_S = 2.0
|
||||
Handler = Callable[[list[str]], Any]
|
||||
|
||||
|
||||
def listen_dsn() -> str:
|
||||
"""收发通知那条专用连接的地址:LISTEN 要一条一直开着的会话,设了直连地址(AGENTLAB_DATABASE_DIRECT_URL)就走它——普通地址
|
||||
可能是 PgBouncer 的事务模式,那里收不到通知。"""
|
||||
from app.db.urls import libpq_conninfo
|
||||
|
||||
return libpq_conninfo(settings.session_db_url)
|
||||
|
||||
|
||||
def _tag() -> str:
|
||||
return identity.owner().rsplit(":", 1)[-1]
|
||||
|
||||
@@ -126,9 +134,8 @@ class Signals:
|
||||
import asyncpg
|
||||
|
||||
from app.db.base import APPLICATION_NAME
|
||||
from app.db.urls import libpq_conninfo
|
||||
|
||||
dsn = libpq_conninfo(settings.database_url)
|
||||
dsn = listen_dsn()
|
||||
first = True
|
||||
while not self._stopping:
|
||||
lost = asyncio.Event()
|
||||
|
||||
Reference in New Issue
Block a user