Fix worker race condition - single uvicorn worker + tolerate duplicates
This commit is contained in:
+3
-2
@@ -11,5 +11,6 @@ RUN pip install --no-cache-dir -r requirements.txt
|
|||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Tables are created at runtime by SQLAlchemy in app/main.py lifespan
|
# Single worker avoids race condition during DB initialization.
|
||||||
CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--workers", "4"]
|
# For a personal app this is fine; async handles concurrent requests well.
|
||||||
|
CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]
|
||||||
+38
-21
@@ -10,21 +10,27 @@ from app.api import auth, activities, routes, health, records, upload
|
|||||||
|
|
||||||
|
|
||||||
async def init_db():
|
async def init_db():
|
||||||
"""Create tables then seed admin, with retries for slow DB startup."""
|
"""Create tables then seed admin, with retries for slow DB startup.
|
||||||
for attempt in range(10):
|
|
||||||
|
Multiple uvicorn workers may race here on first start. We tolerate
|
||||||
|
duplicate table errors since they just mean another worker got there first.
|
||||||
|
"""
|
||||||
|
for attempt in range(15):
|
||||||
try:
|
try:
|
||||||
# Step 1: create all tables (separate connection so it commits cleanly)
|
|
||||||
async with engine.begin() as conn:
|
async with engine.begin() as conn:
|
||||||
await conn.run_sync(Base.metadata.create_all)
|
await conn.run_sync(Base.metadata.create_all)
|
||||||
break
|
break
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
if attempt == 9:
|
msg = str(e).lower()
|
||||||
|
if "already exists" in msg or "duplicate" in msg or "pg_type_typname" in msg:
|
||||||
|
print("Tables already created by another worker - skipping")
|
||||||
|
break
|
||||||
|
if attempt == 14:
|
||||||
raise
|
raise
|
||||||
print(f"DB not ready yet (attempt {attempt + 1}/10): {e}")
|
print(f"DB not ready yet (attempt {attempt + 1}/15): {e}")
|
||||||
await asyncio.sleep(3)
|
await asyncio.sleep(2)
|
||||||
|
|
||||||
# Step 2: try to enable TimescaleDB hypertable (separate connection,
|
# Try TimescaleDB hypertable (non-fatal)
|
||||||
# failure here is non-fatal - falls back to plain Postgres)
|
|
||||||
try:
|
try:
|
||||||
async with engine.begin() as conn:
|
async with engine.begin() as conn:
|
||||||
await conn.execute(text(
|
await conn.execute(text(
|
||||||
@@ -34,24 +40,35 @@ async def init_db():
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"TimescaleDB hypertable skipped: {e}")
|
print(f"TimescaleDB hypertable skipped: {e}")
|
||||||
|
|
||||||
# Step 3: seed admin user
|
# Seed admin user (only if password is configured)
|
||||||
|
if not settings.admin_password:
|
||||||
|
print("ADMIN_PASSWORD not set - skipping admin user seed")
|
||||||
|
return
|
||||||
|
|
||||||
from sqlalchemy import select
|
from sqlalchemy import select
|
||||||
from app.models.user import User
|
from app.models.user import User
|
||||||
from app.core.security import hash_password
|
from app.core.security import hash_password
|
||||||
|
|
||||||
async with AsyncSessionLocal() as db:
|
try:
|
||||||
result = await db.execute(
|
async with AsyncSessionLocal() as db:
|
||||||
select(User).where(User.username == settings.admin_username)
|
result = await db.execute(
|
||||||
)
|
select(User).where(User.username == settings.admin_username)
|
||||||
if not result.scalar_one_or_none():
|
|
||||||
admin = User(
|
|
||||||
username=settings.admin_username,
|
|
||||||
hashed_password=hash_password(settings.admin_password),
|
|
||||||
is_admin=True,
|
|
||||||
)
|
)
|
||||||
db.add(admin)
|
if not result.scalar_one_or_none():
|
||||||
await db.commit()
|
admin = User(
|
||||||
print(f"Admin user '{settings.admin_username}' created")
|
username=settings.admin_username,
|
||||||
|
hashed_password=hash_password(settings.admin_password),
|
||||||
|
is_admin=True,
|
||||||
|
)
|
||||||
|
db.add(admin)
|
||||||
|
await db.commit()
|
||||||
|
print(f"Admin user '{settings.admin_username}' created")
|
||||||
|
except Exception as e:
|
||||||
|
msg = str(e).lower()
|
||||||
|
if "duplicate" in msg or "unique" in msg:
|
||||||
|
print("Admin user already exists - skipping seed")
|
||||||
|
else:
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
@asynccontextmanager
|
@asynccontextmanager
|
||||||
|
|||||||
Reference in New Issue
Block a user