1.1.1
parent
0a7e6e2a8e
commit
e38207ace1
|
|
@ -1,6 +1,7 @@
|
|||
"""
|
||||
Database connection and session management
|
||||
"""
|
||||
from sqlalchemy import text
|
||||
from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession, async_sessionmaker
|
||||
from sqlalchemy.orm import declarative_base
|
||||
from app.config import settings
|
||||
|
|
@ -67,6 +68,54 @@ async def init_db():
|
|||
logger.info("Database tables created successfully")
|
||||
|
||||
|
||||
SERIAL_PKEYS_SQL = text("""
|
||||
SELECT c.oid::regclass::text AS table_ref,
|
||||
quote_ident(a.attname) AS column_ref,
|
||||
to_regclass(pg_get_serial_sequence(c.oid::regclass::text, a.attname))::text AS seq_ref
|
||||
FROM pg_class c
|
||||
JOIN pg_namespace n ON n.oid = c.relnamespace
|
||||
JOIN pg_constraint pk ON pk.conrelid = c.oid AND pk.contype = 'p'
|
||||
JOIN pg_attribute a ON a.attrelid = c.oid AND a.attnum = pk.conkey[1]
|
||||
WHERE n.nspname = current_schema()
|
||||
AND c.relkind = 'r'
|
||||
AND cardinality(pk.conkey) = 1
|
||||
AND to_regclass(pg_get_serial_sequence(c.oid::regclass::text, a.attname)) IS NOT NULL
|
||||
ORDER BY 1
|
||||
""")
|
||||
|
||||
|
||||
async def sync_sequences() -> list[str]:
|
||||
"""把落后的自增序列追到 MAX(id),返回被修正的表。
|
||||
|
||||
库里的数据不少是从 dump / Navicat 脚本导入的,那些 INSERT 自带显式 id,序列不会
|
||||
跟着涨(init_db.sql 还把 menus_id_seq 钉在 10)。序列一旦落在 MAX(id) 后面,任何
|
||||
一条不带 id 的 INSERT 都会撞 duplicate key ... Key (id)=(N) already exists;服务器
|
||||
上启动预置就是把后端撞崩在这上面的。只在序列确实落后时才 setval,正常库不动它。
|
||||
"""
|
||||
fixed: list[str] = []
|
||||
try:
|
||||
async with engine.begin() as conn:
|
||||
rows = (await conn.execute(SERIAL_PKEYS_SQL)).all()
|
||||
for table_ref, column_ref, seq_ref in rows:
|
||||
# 三段名字都是 Postgres 自己引用的(regclass / quote_ident),可直接拼接
|
||||
max_id, next_id = (await conn.execute(text(
|
||||
f"SELECT (SELECT COALESCE(MAX({column_ref}), 0) FROM {table_ref}), "
|
||||
f"(SELECT last_value + is_called::int FROM {seq_ref})"
|
||||
))).one()
|
||||
if next_id <= max_id:
|
||||
await conn.execute(
|
||||
text("SELECT setval(CAST(:seq AS regclass), CAST(:next_id AS bigint), false)"),
|
||||
{"seq": seq_ref, "next_id": max_id + 1},
|
||||
)
|
||||
fixed.append(f"{table_ref}->{max_id + 1}")
|
||||
except Exception as e:
|
||||
# 对齐序列只是修历史数据,失败不该拦住启动
|
||||
logger.warning(f"! Sequence sync skipped: {e}")
|
||||
if fixed:
|
||||
logger.warning(f"✓ Sequences resynced: {', '.join(fixed)}")
|
||||
return fixed
|
||||
|
||||
|
||||
async def close_db():
|
||||
"""Close database connections"""
|
||||
await engine.dispose()
|
||||
|
|
|
|||
|
|
@ -60,6 +60,9 @@ if log_level == logging.WARNING:
|
|||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Postgres advisory-lock key for the boot-time schema + seed init (any app-private bigint)
|
||||
BOOT_INIT_LOCK_KEY = 20251208
|
||||
|
||||
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI):
|
||||
|
|
@ -72,15 +75,8 @@ async def lifespan(app: FastAPI):
|
|||
# Connect to Redis
|
||||
await redis_cache.connect()
|
||||
|
||||
# Initialize database tables (create if not exist)
|
||||
from app.database import engine, Base
|
||||
from app.models.db import SystemSettings # Import to register the model
|
||||
async with engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
logger.info("✓ Database tables initialized")
|
||||
|
||||
# Initialize default system settings
|
||||
from app.database import AsyncSessionLocal
|
||||
from sqlalchemy import text
|
||||
from app.database import engine, Base, AsyncSessionLocal, sync_sequences
|
||||
from app.services.system_settings_service import system_settings_service
|
||||
from app.services.rocket_preset_service import (
|
||||
ensure_high_frequency_rockets,
|
||||
|
|
@ -90,27 +86,49 @@ async def lifespan(app: FastAPI):
|
|||
)
|
||||
from app.services.rocket_event_service import ensure_launch_event_job
|
||||
from app.services.menu_service import ensure_admin_menus
|
||||
async with AsyncSessionLocal() as db:
|
||||
await system_settings_service.initialize_default_settings(db)
|
||||
# 预置高频发射火箭型号 + 发射事件同步定时任务
|
||||
added_rockets = await ensure_high_frequency_rockets(db)
|
||||
# 早已入库的预置型号补写外观构型(管理端填过的不动)
|
||||
await ensure_rocket_appearance(db)
|
||||
# 助推器口径统一:发动机数量各归各位(要在外观预置之后,旧的发动机数藏在 appearance 里)
|
||||
boosted = await ensure_booster_groups(db)
|
||||
# 可回收标记(栅格翼开关)挪到一级与助推器身上,并清掉旧的外观 grid_fins
|
||||
await ensure_recoverable_flags(db)
|
||||
await ensure_launch_event_job(db)
|
||||
# 补插新增后台页面所需的菜单(本次:火箭发射事件)
|
||||
new_menus = await ensure_admin_menus(db)
|
||||
await db.commit()
|
||||
logger.info("✓ Default system settings initialized")
|
||||
if added_rockets:
|
||||
logger.info(f"✓ Rocket presets added: {', '.join(added_rockets)}")
|
||||
if boosted:
|
||||
logger.info(f"✓ Rocket booster presets added: {', '.join(boosted)}")
|
||||
if new_menus:
|
||||
logger.info(f"✓ Admin menus added: {', '.join(new_menus)}")
|
||||
|
||||
# 建表 + 预置数据是"谁先到谁做"的活,4 个 worker 一起跑会撞 CREATE TYPE
|
||||
# (pg_type_typname_nsp_index)也会把同一份预置插好几遍,用 advisory lock 串成临界区。
|
||||
async with engine.connect() as boot_lock:
|
||||
await boot_lock.execute(text("SELECT pg_advisory_lock(:key)"), {"key": BOOT_INIT_LOCK_KEY})
|
||||
try:
|
||||
# Initialize database tables (create if not exist)
|
||||
from app.models.db import SystemSettings # Import to register the model
|
||||
async with engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
logger.info("✓ Database tables initialized")
|
||||
|
||||
# dump / Navicat 导进来的数据自带显式 id,序列不会跟着涨,下一条不带 id 的
|
||||
# INSERT 就撞 duplicate key(服务器上是崩在 menus_pkey Key (id)=(16))
|
||||
await sync_sequences()
|
||||
|
||||
# Initialize default system settings
|
||||
async with AsyncSessionLocal() as db:
|
||||
await system_settings_service.initialize_default_settings(db)
|
||||
# 预置高频发射火箭型号 + 发射事件同步定时任务
|
||||
added_rockets = await ensure_high_frequency_rockets(db)
|
||||
# 早已入库的预置型号补写外观构型(管理端填过的不动)
|
||||
await ensure_rocket_appearance(db)
|
||||
# 助推器口径统一:发动机数量各归各位(要在外观预置之后,旧的发动机数藏在 appearance 里)
|
||||
boosted = await ensure_booster_groups(db)
|
||||
# 可回收标记(栅格翼开关)挪到一级与助推器身上,并清掉旧的外观 grid_fins
|
||||
await ensure_recoverable_flags(db)
|
||||
await ensure_launch_event_job(db)
|
||||
# 补插新增后台页面所需的菜单(本次:火箭发射事件)
|
||||
new_menus = await ensure_admin_menus(db)
|
||||
await db.commit()
|
||||
logger.info("✓ Default system settings initialized")
|
||||
if added_rockets:
|
||||
logger.info(f"✓ Rocket presets added: {', '.join(added_rockets)}")
|
||||
if boosted:
|
||||
logger.info(f"✓ Rocket booster presets added: {', '.join(boosted)}")
|
||||
if new_menus:
|
||||
logger.info(f"✓ Admin menus added: {', '.join(new_menus)}")
|
||||
except Exception:
|
||||
# 只是补建表和补预置数据,不值得让整个 API 起不来
|
||||
logger.exception("✗ Boot-time init failed, continuing startup")
|
||||
finally:
|
||||
await boot_lock.execute(text("SELECT pg_advisory_unlock(:key)"), {"key": BOOT_INIT_LOCK_KEY})
|
||||
|
||||
# Preheat caches (load from database to Redis)
|
||||
await preheat_all_caches()
|
||||
|
|
|
|||
Loading…
Reference in New Issue