fix: re-detect databases at execution time for cluster cleanup
- Detection in preview may fail or return stale results - Re-detect user databases when cleanup is enabled at execution time - Fall back to preview list if re-detection fails - Ensures actual databases are dropped, not just what was detected earlier
This commit is contained in:
@@ -4,8 +4,8 @@ This directory contains pre-compiled binaries for the DB Backup Tool across mult
|
|||||||
|
|
||||||
## Build Information
|
## Build Information
|
||||||
- **Version**: 3.42.50
|
- **Version**: 3.42.50
|
||||||
- **Build Time**: 2026-01-17_15:45:53_UTC
|
- **Build Time**: 2026-01-17_15:54:39_UTC
|
||||||
- **Git Commit**: e363e19
|
- **Git Commit**: 9396c8e
|
||||||
|
|
||||||
## Recent Updates (v1.1.0)
|
## Recent Updates (v1.1.0)
|
||||||
- ✅ Fixed TUI progress display with line-by-line output
|
- ✅ Fixed TUI progress display with line-by-line output
|
||||||
|
|||||||
@@ -273,7 +273,20 @@ func executeRestoreWithTUIProgress(parentCtx context.Context, cfg *config.Config
|
|||||||
defer dbClient.Close()
|
defer dbClient.Close()
|
||||||
|
|
||||||
// STEP 1: Clean cluster if requested (drop all existing user databases)
|
// STEP 1: Clean cluster if requested (drop all existing user databases)
|
||||||
if restoreType == "restore-cluster" && cleanClusterFirst && len(existingDBs) > 0 {
|
if restoreType == "restore-cluster" && cleanClusterFirst {
|
||||||
|
// Re-detect databases at execution time to get current state
|
||||||
|
// The preview list may be stale or detection may have failed earlier
|
||||||
|
safety := restore.NewSafety(cfg, log)
|
||||||
|
currentDBs, err := safety.ListUserDatabases(ctx)
|
||||||
|
if err != nil {
|
||||||
|
log.Warn("Failed to list databases for cleanup, using preview list", "error", err)
|
||||||
|
currentDBs = existingDBs // Fall back to preview list
|
||||||
|
} else if len(currentDBs) > 0 {
|
||||||
|
log.Info("Re-detected user databases for cleanup", "count", len(currentDBs), "databases", currentDBs)
|
||||||
|
existingDBs = currentDBs // Update with fresh list
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(existingDBs) > 0 {
|
||||||
log.Info("Dropping existing user databases before cluster restore", "count", len(existingDBs))
|
log.Info("Dropping existing user databases before cluster restore", "count", len(existingDBs))
|
||||||
|
|
||||||
// Drop databases using command-line psql (no connection required)
|
// Drop databases using command-line psql (no connection required)
|
||||||
@@ -293,6 +306,9 @@ func executeRestoreWithTUIProgress(parentCtx context.Context, cfg *config.Config
|
|||||||
}
|
}
|
||||||
|
|
||||||
log.Info("Cluster cleanup completed", "dropped", droppedCount, "total", len(existingDBs))
|
log.Info("Cluster cleanup completed", "dropped", droppedCount, "total", len(existingDBs))
|
||||||
|
} else {
|
||||||
|
log.Info("No user databases to clean up")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// STEP 2: Create restore engine with silent progress (no stdout interference with TUI)
|
// STEP 2: Create restore engine with silent progress (no stdout interference with TUI)
|
||||||
|
|||||||
Reference in New Issue
Block a user