Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ui): Task summary should show fatal errors #3190

Merged
merged 1 commit into from Aug 3, 2023
Merged

fix(ui): Task summary should show fatal errors #3190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 12 additions & 10 deletions snapshot/snapshotfs/upload_progress.go
View file
Open in desktop
Expand Up @@ -257,15 +257,17 @@
defer p.mu.Unlock()

return UploadCounters{
TotalCachedFiles: atomic.LoadInt32(&p.counters.TotalCachedFiles),
TotalHashedFiles: atomic.LoadInt32(&p.counters.TotalHashedFiles),
TotalCachedBytes: atomic.LoadInt64(&p.counters.TotalCachedBytes),
TotalHashedBytes: atomic.LoadInt64(&p.counters.TotalHashedBytes),
EstimatedBytes: atomic.LoadInt64(&p.counters.EstimatedBytes),
EstimatedFiles: atomic.LoadInt32(&p.counters.EstimatedFiles),
CurrentDirectory: p.counters.CurrentDirectory,
LastErrorPath: p.counters.LastErrorPath,
LastError: p.counters.LastError,
TotalCachedFiles: atomic.LoadInt32(&p.counters.TotalCachedFiles),
TotalHashedFiles: atomic.LoadInt32(&p.counters.TotalHashedFiles),
TotalCachedBytes: atomic.LoadInt64(&p.counters.TotalCachedBytes),
TotalHashedBytes: atomic.LoadInt64(&p.counters.TotalHashedBytes),
EstimatedBytes: atomic.LoadInt64(&p.counters.EstimatedBytes),
EstimatedFiles: atomic.LoadInt32(&p.counters.EstimatedFiles),
IgnoredErrorCount: atomic.LoadInt32(&p.counters.IgnoredErrorCount),
FatalErrorCount: atomic.LoadInt32(&p.counters.FatalErrorCount),
CurrentDirectory: p.counters.CurrentDirectory,
LastErrorPath: p.counters.LastErrorPath,
LastError: p.counters.LastError,

Check warning on line 270 in snapshot/snapshotfs/upload_progress.go

View check run for this annotation

Codecov / codecov/patch

snapshot/snapshotfs/upload_progress.go#L260-L270 

Added lines #L260 - L270 were not covered by tests
}
}

Expand All @@ -292,7 +294,7 @@
"Excluded Files": uitask.SimpleCounter(int64(atomic.LoadInt32(&p.counters.TotalExcludedFiles))),
"Excluded Directories": uitask.SimpleCounter(int64(atomic.LoadInt32(&p.counters.TotalExcludedDirs))),

"Errors": uitask.ErrorCounter(int64(atomic.LoadInt32(&p.counters.IgnoredErrorCount))),
"Errors": uitask.ErrorCounter(int64(atomic.LoadInt32(&p.counters.FatalErrorCount))),
}

if !final {
Expand Down