From 301748c44b0bec9ca472d182db02e6c0e7175b02 Mon Sep 17 00:00:00 2001
From: Aishwarya Lad <67022814+Aishwarya-Lad@users.noreply.github.com>
Date: Thu, 1 Feb 2024 12:25:24 -0800
Subject: [PATCH 1/2] approprite error msg

---
 cache/rebuilder.go | 2 +-
 cache/restorer.go  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cache/rebuilder.go b/cache/rebuilder.go
index 479ab190..a4e5790d 100644
--- a/cache/rebuilder.go
+++ b/cache/rebuilder.go
@@ -140,7 +140,7 @@ func (r rebuilder) rebuild(src, dst string) (err error) {
 	tr := io.TeeReader(pr, sw)
 
 	if err := r.s.Put(dst, tr); err != nil {
-		err = fmt.Errorf("upload file, pipe reader failed, %w", err)
+		err = fmt.Errorf("failure in uploading file to archived directory, %w", err)
 		if err := pr.CloseWithError(err); err != nil {
 			level.Error(r.logger).Log("msg", "pr close", "err", err)
 		}
diff --git a/cache/restorer.go b/cache/restorer.go
index 85458351..1f718f5a 100644
--- a/cache/restorer.go
+++ b/cache/restorer.go
@@ -124,7 +124,7 @@ func (r restorer) restore(src, dst string) (err error) {
 
 	written, err := r.a.Extract(dst, pr)
 	if err != nil {
-		err = fmt.Errorf("extract files from downloaded archive, pipe reader failed, %w", err)
+		err = fmt.Errorf("failure in extracting files from downloaded archive, %w", err)
 		if err := pr.CloseWithError(err); err != nil {
 			level.Error(r.logger).Log("msg", "pr close", "err", err)
 		}

From a445f8c78c9f9c69488eecd1aab3fe930cebc69b Mon Sep 17 00:00:00 2001
From: Aishwarya Lad <67022814+Aishwarya-Lad@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:42:07 -0800
Subject: [PATCH 2/2] review comments

Modify error msg to warning msg

modify error
---
 cache/rebuilder.go | 4 ++--
 cache/restorer.go  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cache/rebuilder.go b/cache/rebuilder.go
index a4e5790d..22d544b3 100644
--- a/cache/rebuilder.go
+++ b/cache/rebuilder.go
@@ -93,7 +93,7 @@ func (r rebuilder) Rebuild(srcs []string) error {
 	wg.Wait()
 
 	if errs.Err() != nil {
-		return fmt.Errorf("rebuild failed, %w", errs)
+		level.Warn(r.logger).Log("msg", "ignore archival, ", errs.Err())
 	}
 
 	level.Info(r.logger).Log("msg", "cache built", "took", time.Since(now))
@@ -140,7 +140,7 @@ func (r rebuilder) rebuild(src, dst string) (err error) {
 	tr := io.TeeReader(pr, sw)
 
 	if err := r.s.Put(dst, tr); err != nil {
-		err = fmt.Errorf("failure in uploading file to archived directory, %w", err)
+		err = fmt.Errorf("failed to upload file to cache storage, %w", err)
 		if err := pr.CloseWithError(err); err != nil {
 			level.Error(r.logger).Log("msg", "pr close", "err", err)
 		}
diff --git a/cache/restorer.go b/cache/restorer.go
index 1f718f5a..03e93205 100644
--- a/cache/restorer.go
+++ b/cache/restorer.go
@@ -124,7 +124,7 @@ func (r restorer) restore(src, dst string) (err error) {
 
 	written, err := r.a.Extract(dst, pr)
 	if err != nil {
-		err = fmt.Errorf("failure in extracting files from downloaded archive, %w", err)
+		err = fmt.Errorf("failed to extract files from downloaded archive, %w", err)
 		if err := pr.CloseWithError(err); err != nil {
 			level.Error(r.logger).Log("msg", "pr close", "err", err)
 		}