Skip to content

Hide cache restore/rebuild time in mock cache and revert non-helpful logs #13

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

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Hide cache restore/rebuild time in mock cache and revert non-helpful logs #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcb0e4d
Revert "Merge pull request #12 from sachinkumargit/cache-time-HYP-8063"
sachinkumargit Jan 11, 2024
06b866b
hide time in mock cache
sachinkumargit Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cache/rebuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ func (r rebuilder) Rebuild(srcs []string, mockDownloadUpload bool) error {
if errs.Err() != nil {
return fmt.Errorf("rebuild failed, %w", errs)
}

if mockDownloadUpload {
level.Info(r.logger).Log("msg", "cache built")
return nil
}
level.Info(r.logger).Log("msg", "cache built", "took", time.Since(now))

return nil
Expand Down
9 changes: 5 additions & 4 deletions cache/restorer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ func (r restorer) Restore(dsts []string, mockDownloadUpload bool) error {
return fmt.Errorf("restore failed, %w", errs)
}

if mockDownloadUpload {
level.Info(r.logger).Log("msg", "cache restored")
return nil
}
level.Info(r.logger).Log("msg", "cache restored", "took", time.Since(now))

return nil
Expand All @@ -83,7 +87,7 @@ func (r restorer) restore(src, dst string, mockDownloadUpload bool) error {

go func() {
defer internal.CloseWithErrLogf(r.logger, pw, "pw close defer")
start := time.Now()

level.Info(r.logger).Log("msg", "downloading archived directory", "remote", src, "local", dst)

if mockDownloadUpload {
Expand All @@ -94,7 +98,6 @@ func (r restorer) restore(src, dst string, mockDownloadUpload bool) error {
level.Error(r.logger).Log("msg", "pw close", "err", err)
}
}
level.Info(r.logger).Log("msg", "downloaded archived directory", "remote", src, "local", dst, "took", time.Since(start))
}()

level.Info(r.logger).Log("msg", "extracting archived directory", "remote", src, "local", dst)
Expand All @@ -108,7 +111,6 @@ func (r restorer) restore(src, dst string, mockDownloadUpload bool) error {
return nil
}

start := time.Now()
written, err := r.a.Extract(dst, pr)
if err != nil {
err = fmt.Errorf("extract files from downloaded archive, pipe reader failed, %w", err)
Expand All @@ -124,7 +126,6 @@ func (r restorer) restore(src, dst string, mockDownloadUpload bool) error {
"local", dst,
"remote", src,
"raw size", written,
"took", time.Since(start),
)

return nil
Expand Down