feat(tui): unified cluster backup progress display
- Add combined overall progress bar showing all phases (0-100%) - Phase 1/3: Backing up Globals (0-15% of overall) - Phase 2/3: Backing up Databases (15-90% of overall) - Phase 3/3: Compressing Archive (90-100% of overall) - Show current database name during backup - Phase-aware progress tracking with overallPhase, phaseDesc - Dual progress bars: overall + database count - Consistent with cluster restore progress display v3.42.49
This commit is contained in:
20
CHANGELOG.md
20
CHANGELOG.md
@@ -5,6 +5,26 @@ All notable changes to dbbackup will be documented in this file.
|
|||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [3.42.49] - 2026-01-16 "Unified Cluster Backup Progress"
|
||||||
|
|
||||||
|
### Added - Unified Progress Display for Cluster Backup
|
||||||
|
- **Combined overall progress bar** for cluster backup showing all phases:
|
||||||
|
- Phase 1/3: Backing up Globals (0-15% of overall)
|
||||||
|
- Phase 2/3: Backing up Databases (15-90% of overall)
|
||||||
|
- Phase 3/3: Compressing Archive (90-100% of overall)
|
||||||
|
- **Current database indicator** - Shows which database is currently being backed up
|
||||||
|
- **Phase-aware progress tracking** - New fields in backup progress state:
|
||||||
|
- `overallPhase` - Current phase (1=globals, 2=databases, 3=compressing)
|
||||||
|
- `phaseDesc` - Human-readable phase description
|
||||||
|
- **Dual progress bars** for cluster backup:
|
||||||
|
- Overall progress bar showing combined operation progress
|
||||||
|
- Database count progress bar showing individual database progress
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Cluster backup TUI now shows unified progress display matching restore
|
||||||
|
- Progress callbacks now include phase information
|
||||||
|
- Better visual feedback during entire cluster backup operation
|
||||||
|
|
||||||
## [3.42.48] - 2026-01-15 "Unified Cluster Restore Progress"
|
## [3.42.48] - 2026-01-15 "Unified Cluster Restore Progress"
|
||||||
|
|
||||||
### Added - Unified Progress Display for Cluster Restore
|
### Added - Unified Progress Display for Cluster Restore
|
||||||
|
|||||||
@@ -3,9 +3,9 @@
|
|||||||
This directory contains pre-compiled binaries for the DB Backup Tool across multiple platforms and architectures.
|
This directory contains pre-compiled binaries for the DB Backup Tool across multiple platforms and architectures.
|
||||||
|
|
||||||
## Build Information
|
## Build Information
|
||||||
- **Version**: 3.42.34
|
- **Version**: 3.42.48
|
||||||
- **Build Time**: 2026-01-16_13:36:18_UTC
|
- **Build Time**: 2026-01-16_14:32:45_UTC
|
||||||
- **Git Commit**: 838c5b8
|
- **Git Commit**: 780beaa
|
||||||
|
|
||||||
## 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
|
||||||
|
|||||||
@@ -36,18 +36,22 @@ type BackupExecutionModel struct {
|
|||||||
spinnerFrame int
|
spinnerFrame int
|
||||||
|
|
||||||
// Database count progress (for cluster backup)
|
// Database count progress (for cluster backup)
|
||||||
dbTotal int
|
dbTotal int
|
||||||
dbDone int
|
dbDone int
|
||||||
dbName string // Current database being backed up
|
dbName string // Current database being backed up
|
||||||
|
overallPhase int // 1=globals, 2=databases, 3=compressing
|
||||||
|
phaseDesc string // Description of current phase
|
||||||
}
|
}
|
||||||
|
|
||||||
// sharedBackupProgressState holds progress state that can be safely accessed from callbacks
|
// sharedBackupProgressState holds progress state that can be safely accessed from callbacks
|
||||||
type sharedBackupProgressState struct {
|
type sharedBackupProgressState struct {
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
dbTotal int
|
dbTotal int
|
||||||
dbDone int
|
dbDone int
|
||||||
dbName string
|
dbName string
|
||||||
hasUpdate bool
|
overallPhase int // 1=globals, 2=databases, 3=compressing
|
||||||
|
phaseDesc string // Description of current phase
|
||||||
|
hasUpdate bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// Package-level shared progress state for backup operations
|
// Package-level shared progress state for backup operations
|
||||||
@@ -68,12 +72,12 @@ func clearCurrentBackupProgress() {
|
|||||||
currentBackupProgressState = nil
|
currentBackupProgressState = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func getCurrentBackupProgress() (dbTotal, dbDone int, dbName string, hasUpdate bool) {
|
func getCurrentBackupProgress() (dbTotal, dbDone int, dbName string, overallPhase int, phaseDesc string, hasUpdate bool) {
|
||||||
currentBackupProgressMu.Lock()
|
currentBackupProgressMu.Lock()
|
||||||
defer currentBackupProgressMu.Unlock()
|
defer currentBackupProgressMu.Unlock()
|
||||||
|
|
||||||
if currentBackupProgressState == nil {
|
if currentBackupProgressState == nil {
|
||||||
return 0, 0, "", false
|
return 0, 0, "", 0, "", false
|
||||||
}
|
}
|
||||||
|
|
||||||
currentBackupProgressState.mu.Lock()
|
currentBackupProgressState.mu.Lock()
|
||||||
@@ -83,7 +87,8 @@ func getCurrentBackupProgress() (dbTotal, dbDone int, dbName string, hasUpdate b
|
|||||||
currentBackupProgressState.hasUpdate = false
|
currentBackupProgressState.hasUpdate = false
|
||||||
|
|
||||||
return currentBackupProgressState.dbTotal, currentBackupProgressState.dbDone,
|
return currentBackupProgressState.dbTotal, currentBackupProgressState.dbDone,
|
||||||
currentBackupProgressState.dbName, hasUpdate
|
currentBackupProgressState.dbName, currentBackupProgressState.overallPhase,
|
||||||
|
currentBackupProgressState.phaseDesc, hasUpdate
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewBackupExecution(cfg *config.Config, log logger.Logger, parent tea.Model, ctx context.Context, backupType, dbName string, ratio int) BackupExecutionModel {
|
func NewBackupExecution(cfg *config.Config, log logger.Logger, parent tea.Model, ctx context.Context, backupType, dbName string, ratio int) BackupExecutionModel {
|
||||||
@@ -171,6 +176,8 @@ func executeBackupWithTUIProgress(parentCtx context.Context, cfg *config.Config,
|
|||||||
progressState.dbDone = done
|
progressState.dbDone = done
|
||||||
progressState.dbTotal = total
|
progressState.dbTotal = total
|
||||||
progressState.dbName = currentDB
|
progressState.dbName = currentDB
|
||||||
|
progressState.overallPhase = 2 // Phase 2: Backing up databases
|
||||||
|
progressState.phaseDesc = fmt.Sprintf("Phase 2/3: Databases (%d/%d)", done, total)
|
||||||
progressState.hasUpdate = true
|
progressState.hasUpdate = true
|
||||||
progressState.mu.Unlock()
|
progressState.mu.Unlock()
|
||||||
})
|
})
|
||||||
@@ -223,11 +230,13 @@ func (m BackupExecutionModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||||||
m.spinnerFrame = (m.spinnerFrame + 1) % len(spinnerFrames)
|
m.spinnerFrame = (m.spinnerFrame + 1) % len(spinnerFrames)
|
||||||
|
|
||||||
// Poll for database progress updates from callbacks
|
// Poll for database progress updates from callbacks
|
||||||
dbTotal, dbDone, dbName, hasUpdate := getCurrentBackupProgress()
|
dbTotal, dbDone, dbName, overallPhase, phaseDesc, hasUpdate := getCurrentBackupProgress()
|
||||||
if hasUpdate {
|
if hasUpdate {
|
||||||
m.dbTotal = dbTotal
|
m.dbTotal = dbTotal
|
||||||
m.dbDone = dbDone
|
m.dbDone = dbDone
|
||||||
m.dbName = dbName
|
m.dbName = dbName
|
||||||
|
m.overallPhase = overallPhase
|
||||||
|
m.phaseDesc = phaseDesc
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update status based on progress and elapsed time
|
// Update status based on progress and elapsed time
|
||||||
@@ -361,19 +370,68 @@ func (m BackupExecutionModel) View() string {
|
|||||||
|
|
||||||
// Status display
|
// Status display
|
||||||
if !m.done {
|
if !m.done {
|
||||||
// Show database progress bar if we have progress data (cluster backup)
|
// Unified progress display for cluster backup
|
||||||
if m.dbTotal > 0 && m.dbDone > 0 {
|
if m.backupType == "cluster" {
|
||||||
// Show progress bar instead of spinner when we have real progress
|
// Calculate overall progress across all phases
|
||||||
progressBar := renderBackupDatabaseProgressBar(m.dbDone, m.dbTotal, m.dbName, 50)
|
// Phase 1: Globals (0-15%)
|
||||||
s.WriteString(progressBar + "\n")
|
// Phase 2: Databases (15-90%)
|
||||||
s.WriteString(fmt.Sprintf(" %s\n", m.status))
|
// Phase 3: Compressing (90-100%)
|
||||||
} else {
|
overallProgress := 0
|
||||||
// Show spinner during initial phases
|
phaseLabel := "Starting..."
|
||||||
if m.cancelling {
|
|
||||||
s.WriteString(fmt.Sprintf(" %s %s\n", spinnerFrames[m.spinnerFrame], m.status))
|
elapsedSec := int(time.Since(m.startTime).Seconds())
|
||||||
} else {
|
|
||||||
s.WriteString(fmt.Sprintf(" %s %s\n", spinnerFrames[m.spinnerFrame], m.status))
|
if m.overallPhase == 2 && m.dbTotal > 0 {
|
||||||
|
// Phase 2: Database backups - contributes 15-90%
|
||||||
|
dbPct := int((int64(m.dbDone) * 100) / int64(m.dbTotal))
|
||||||
|
overallProgress = 15 + (dbPct * 75 / 100)
|
||||||
|
phaseLabel = m.phaseDesc
|
||||||
|
} else if elapsedSec < 5 {
|
||||||
|
// Initial setup
|
||||||
|
overallProgress = 2
|
||||||
|
phaseLabel = "Phase 1/3: Initializing..."
|
||||||
|
} else if m.dbTotal == 0 {
|
||||||
|
// Phase 1: Globals backup (before databases start)
|
||||||
|
overallProgress = 10
|
||||||
|
phaseLabel = "Phase 1/3: Backing up Globals"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Header with phase and overall progress
|
||||||
|
s.WriteString(infoStyle.Render(" ─── Cluster Backup Progress ──────────────────────────────"))
|
||||||
|
s.WriteString("\n\n")
|
||||||
|
s.WriteString(fmt.Sprintf(" %s\n\n", phaseLabel))
|
||||||
|
|
||||||
|
// Overall progress bar
|
||||||
|
s.WriteString(" Overall: ")
|
||||||
|
s.WriteString(renderProgressBar(overallProgress))
|
||||||
|
s.WriteString(fmt.Sprintf(" %d%%\n", overallProgress))
|
||||||
|
|
||||||
|
// Phase-specific details
|
||||||
|
if m.dbTotal > 0 && m.dbDone > 0 {
|
||||||
|
// Show current database being backed up
|
||||||
|
s.WriteString("\n")
|
||||||
|
spinner := spinnerFrames[m.spinnerFrame]
|
||||||
|
if m.dbName != "" && m.dbDone <= m.dbTotal {
|
||||||
|
s.WriteString(fmt.Sprintf(" Current: %s %s\n", spinner, m.dbName))
|
||||||
|
}
|
||||||
|
s.WriteString("\n")
|
||||||
|
|
||||||
|
// Database progress bar
|
||||||
|
progressBar := renderBackupDatabaseProgressBar(m.dbDone, m.dbTotal, m.dbName, 50)
|
||||||
|
s.WriteString(progressBar + "\n")
|
||||||
|
} else {
|
||||||
|
// Intermediate phase (globals)
|
||||||
|
spinner := spinnerFrames[m.spinnerFrame]
|
||||||
|
s.WriteString(fmt.Sprintf("\n %s %s\n\n", spinner, m.status))
|
||||||
|
}
|
||||||
|
|
||||||
|
s.WriteString("\n")
|
||||||
|
s.WriteString(infoStyle.Render(" ───────────────────────────────────────────────────────────"))
|
||||||
|
s.WriteString("\n\n")
|
||||||
|
} else {
|
||||||
|
// Single/sample database backup - simpler display
|
||||||
|
spinner := spinnerFrames[m.spinnerFrame]
|
||||||
|
s.WriteString(fmt.Sprintf(" %s %s\n", spinner, m.status))
|
||||||
}
|
}
|
||||||
|
|
||||||
if !m.cancelling {
|
if !m.cancelling {
|
||||||
|
|||||||
Reference in New Issue
Block a user