ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-11 20:05:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix file lock (#33)

Browse source 
Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Classic298 2025-11-13 18:01:25 +01:00 committed by GitHub
parent 873b73e668
commit 20187f9a2d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 50 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
backend/open_webui/routers/prune.py
View file

@ -1381,6 +1381,13 @@ async def prune_data(form_data: PruneDataForm, user=Depends(get_admin_user)):
If dry_run=True (default), returns preview counts without deleting anything. If dry_run=True (default), returns preview counts without deleting anything.
If dry_run=False, performs actual deletion and returns True on success. If dry_run=False, performs actual deletion and returns True on success.
""" """
# Acquire lock to prevent concurrent operations (including previews)
if not PruneLock.acquire():
raise HTTPException(
status_code=status.HTTP_409_CONFLICT,
detail="A prune operation is already in progress. Please wait for it to complete."
)
try: try:
# Get vector database cleaner based on configuration # Get vector database cleaner based on configuration
vector_cleaner = get_vector_database_cleaner() vector_cleaner = get_vector_database_cleaner()
@ -1642,45 +1649,54 @@ async def prune_data(form_data: PruneDataForm, user=Depends(get_admin_user)):
warnings.append(f"Vector cleanup warning: {vector_error}") warnings.append(f"Vector cleanup warning: {vector_error}")
log.warning(f"Vector cleanup completed with errors: {vector_error}") log.warning(f"Vector cleanup completed with errors: {vector_error}")
# Stage 5: Audio cache cleanup # Use modular vector database cleanup
log.info("Cleaning audio cache") warnings = []
cleanup_audio_cache(form_data.audio_cache_max_age_days) deleted_vector_count, vector_error = vector_cleaner.cleanup_orphaned_collections(
final_active_file_ids, final_active_kb_ids
)
if vector_error:
warnings.append(f"Vector cleanup warning: {vector_error}")
log.warning(f"Vector cleanup completed with errors: {vector_error}")
# Stage 6: Database optimization (optional) # Stage 6: Database optimization (optional)
if form_data.run_vacuum: if form_data.run_vacuum:
log.info("Optimizing database with VACUUM (this may take a while and lock the database)") log.info("Optimizing database with VACUUM (this may take a while and lock the database)")
# Stage 6: Database optimization (optional)
if form_data.run_vacuum:
log.info("Optimizing database with VACUUM (this may take a while and lock the database)")
try:
with get_db() as db:
db.execute(text("VACUUM"))
log.info("Vacuumed main database")
except Exception as e:
log.error(f"Failed to vacuum main database: {e}")
# Vector database-specific optimization
if isinstance(vector_cleaner, ChromaDatabaseCleaner):
try: try:
with get_db() as db: with sqlite3.connect(str(vector_cleaner.chroma_db_path)) as conn:
db.execute(text("VACUUM")) conn.execute("VACUUM")
log.info("Vacuumed main database") log.info("Vacuumed ChromaDB database")
except Exception as e: except Exception as e:
log.error(f"Failed to vacuum main database: {e}") log.error(f"Failed to vacuum ChromaDB database: {e}")
elif (
isinstance(vector_cleaner, PGVectorDatabaseCleaner)
and vector_cleaner.session
):
try:
vector_cleaner.session.execute(text("VACUUM ANALYZE"))
vector_cleaner.session.commit()
log.info("Executed VACUUM ANALYZE on PostgreSQL database")
except Exception as e:
log.error(f"Failed to vacuum PostgreSQL database: {e}")
else:
log.info("Skipping VACUUM optimization (not enabled)")
# Vector database-specific optimization # Log any warnings collected during pruning
if isinstance(vector_cleaner, ChromaDatabaseCleaner): if warnings:
try: log.warning(f"Data pruning completed with warnings: {'; '.join(warnings)}")
with sqlite3.connect(str(vector_cleaner.chroma_db_path)) as conn:
conn.execute("VACUUM")
log.info("Vacuumed ChromaDB database")
except Exception as e:
log.error(f"Failed to vacuum ChromaDB database: {e}")
elif (
isinstance(vector_cleaner, PGVectorDatabaseCleaner)
and vector_cleaner.session
):
try:
vector_cleaner.session.execute(text("VACUUM ANALYZE"))
vector_cleaner.session.commit()
log.info("Executed VACUUM ANALYZE on PostgreSQL database")
except Exception as e:
log.error(f"Failed to vacuum PostgreSQL database: {e}")
else:
log.info("Skipping VACUUM optimization (not enabled)")
# Log any warnings collected during pruning
if warnings:
log.warning(f"Data pruning completed with warnings: {'; '.join(warnings)}")
log.info("Data pruning completed successfully") log.info("Data pruning completed successfully")
return True return True
@ -1695,3 +1711,6 @@ async def prune_data(form_data: PruneDataForm, user=Depends(get_admin_user)):
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
detail=ERROR_MESSAGES.DEFAULT("Data pruning failed"), detail=ERROR_MESSAGES.DEFAULT("Data pruning failed"),
) )
finally:
# Always release lock, even if operation fails
PruneLock.release()