mirror of
https://github.com/ThearchyHelios/AgentLab.git
synced 2026-11-16 23:12:00 +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:
@@ -0,0 +1,69 @@
|
||||
"""直连地址和 PgBouncer 事务模式(AGENTLAB_DATABASE_DIRECT_URL、AGENTLAB_DB_PGBOUNCER):地址怎么解析、哪些连接走直连、事务模式下
|
||||
关掉了哪些东西。只建引擎、不连库,两种库都跑。"""
|
||||
from __future__ import annotations
|
||||
|
||||
import pytest
|
||||
from sqlalchemy.pool import NullPool
|
||||
|
||||
from app.core.config import Settings, settings
|
||||
|
||||
APP = "postgres://agentlab:secret@pgbouncer.internal:6432/agentlab"
|
||||
DIRECT = "postgresql://agentlab:secret@db.internal:5432/agentlab"
|
||||
|
||||
|
||||
def test_the_direct_url_is_normalized_and_used_for_session_bound_connections():
|
||||
s = Settings(database_url=APP, database_direct_url=DIRECT, _env_file=None)
|
||||
assert s.database_url.startswith("postgresql+asyncpg://") and "pgbouncer.internal:6432" in s.database_url
|
||||
assert s.database_direct_url.startswith("postgresql+asyncpg://") and "db.internal:5432" in s.database_direct_url
|
||||
assert s.session_db_url == s.database_direct_url
|
||||
assert "db.internal" in s.checkpoint_conninfo and s.checkpoint_conninfo.startswith("postgresql://"), "断点库缺省走直连"
|
||||
plain = Settings(database_url=APP, _env_file=None)
|
||||
assert plain.session_db_url == plain.database_url and "pgbouncer.internal" in plain.checkpoint_conninfo, "不设就全用同一个"
|
||||
with pytest.raises(ValueError, match="AGENTLAB_DATABASE_DIRECT_URL"):
|
||||
Settings(database_url=APP, database_direct_url="mysql://x@y/z", _env_file=None)
|
||||
|
||||
|
||||
def test_transaction_mode_turns_off_client_pooling_and_statement_caches():
|
||||
from app.db.base import pg_engine_kwargs
|
||||
|
||||
kw = pg_engine_kwargs(pgbouncer=True)
|
||||
assert kw["poolclass"] is NullPool
|
||||
args = kw["connect_args"]
|
||||
assert args["statement_cache_size"] == 0 and args["prepared_statement_cache_size"] == 0
|
||||
names = {args["prepared_statement_name_func"]() for _ in range(3)}
|
||||
assert len(names) == 3, "预备语句的名字每次都不一样,不和别的客户端撞名"
|
||||
direct = pg_engine_kwargs(pgbouncer=False, pool_size=5)
|
||||
assert direct["pool_size"] == 5 and "statement_cache_size" not in direct["connect_args"]
|
||||
|
||||
|
||||
def test_listen_and_cluster_locks_go_direct(monkeypatch):
|
||||
from app.cluster.signal import listen_dsn
|
||||
from app.db import base
|
||||
|
||||
monkeypatch.setattr(settings, "database_url", Settings(database_url=APP, _env_file=None).database_url)
|
||||
monkeypatch.setattr(settings, "database_direct_url", Settings(database_url=APP, database_direct_url=DIRECT,
|
||||
_env_file=None).database_direct_url)
|
||||
monkeypatch.setattr(base, "_session_engine", None)
|
||||
assert "db.internal:5432" in listen_dsn() and listen_dsn().startswith("postgresql://")
|
||||
made = base.session_engine()
|
||||
try:
|
||||
assert made is not base.engine and made.url.host == "db.internal" and made.url.port == 5432
|
||||
assert base.session_engine() is made, "直连那个池子只建一个"
|
||||
finally:
|
||||
monkeypatch.setattr(base, "_session_engine", None)
|
||||
made.sync_engine.dispose()
|
||||
monkeypatch.setattr(settings, "database_direct_url", "")
|
||||
assert base.session_engine() is base.engine and "pgbouncer.internal" in listen_dsn()
|
||||
|
||||
|
||||
def test_transaction_mode_without_a_direct_url_refuses_to_start(monkeypatch):
|
||||
from app.db import base
|
||||
|
||||
monkeypatch.setattr(settings, "database_url", Settings(database_url=APP, _env_file=None).database_url)
|
||||
monkeypatch.setattr(settings, "db_pgbouncer", True)
|
||||
monkeypatch.setattr(settings, "database_direct_url", "")
|
||||
with pytest.raises(RuntimeError, match="AGENTLAB_DATABASE_DIRECT_URL"):
|
||||
base.check_pgbouncer()
|
||||
monkeypatch.setattr(settings, "database_direct_url", Settings(database_url=APP, database_direct_url=DIRECT,
|
||||
_env_file=None).database_direct_url)
|
||||
base.check_pgbouncer()
|
||||
Reference in New Issue
Block a user