feat: show more error information in zb output

Signed-off-by: Andrei Aaron <[email protected]>

Author: andaaron

cmd/zb/helper.go

@@ -119,11 +119,12 @@ func pullAndCollect(url string, repos []string, manifestItem manifestStruct,
 	func() {
 		start := time.Now()
 
-		var isConnFail, isErr bool
-
-		var statusCode int
-
-		var latency time.Duration
+		var (
+			isConnFail, isErr bool
+			statusCode        int
+			latency           time.Duration
+			err               error
+		)
 
 		defer func() {
 			// send a stats record
@@ -132,6 +133,7 @@ func pullAndCollect(url string, repos []string, manifestItem manifestStruct,
 				statusCode: statusCode,
 				isConnFail: isConnFail,
 				isErr:      isErr,
+				err:        err,
 			}
 		}()
 
@@ -144,8 +146,10 @@ func pullAndCollect(url string, repos []string, manifestItem manifestStruct,
 		for repo, manifestTag := range manifestHash {
 			manifestLoc := fmt.Sprintf("%s/v2/%s/manifests/%s", url, repo, manifestTag)
 
+			var resp *resty.Response
+
 			// check manifest
-			resp, err := client.R().
+			resp, err = client.R().
 				SetHeader("Content-Type", "application/vnd.oci.image.manifest.v1+json").
 				Head(manifestLoc)
 
@@ -261,7 +265,7 @@ func pullAndCollect(url string, repos []string, manifestItem manifestStruct,
 				blobLoc := fmt.Sprintf("%s/v2/%s/blobs/%s", url, repo, blobDigest)
 
 				// check blob
-				resp, err := client.R().Head(blobLoc)
+				resp, err = client.R().Head(blobLoc)
 
 				latency = time.Since(start)
 
@@ -476,11 +480,12 @@ func pushMonolithAndCollect(workdir, url, trepo string, count int,
 	func() {
 		start := time.Now()
 
-		var isConnFail, isErr bool
-
-		var statusCode int
-
-		var latency time.Duration
+		var (
+			isConnFail, isErr bool
+			statusCode        int
+			latency           time.Duration
+			err               error
+		)
 
 		defer func() {
 			// send a stats record
@@ -489,6 +494,7 @@ func pushMonolithAndCollect(workdir, url, trepo string, count int,
 				statusCode: statusCode,
 				isConnFail: isConnFail,
 				isErr:      isErr,
+				err:        err,
 			}
 		}()
 
@@ -680,11 +686,12 @@ func pushChunkAndCollect(workdir, url, trepo string, count int,
 	func() {
 		start := time.Now()
 
-		var isConnFail, isErr bool
-
-		var statusCode int
-
-		var latency time.Duration
+		var (
+			isConnFail, isErr bool
+			statusCode        int
+			latency           time.Duration
+			err               error
+		)
 
 		defer func() {
 			// send a stats record
@@ -693,6 +700,7 @@ func pushChunkAndCollect(workdir, url, trepo string, count int,
 				statusCode: statusCode,
 				isConnFail: isConnFail,
 				isErr:      isErr,
+				err:        err,
 			}
 		}()
 

cmd/zb/perf.go

@@ -126,7 +126,8 @@ type statsSummary struct {
 	statusHist           map[string]int
 	rps                  float32
 	mixedSize, mixedType bool
-	errors               int
+	errorCount           int
+	errors               []error
 }
 
 func newStatsSummary(name string) statsSummary {
@@ -147,11 +148,16 @@ type statsRecord struct {
 	statusCode int
 	isConnFail bool
 	isErr      bool
+	err        error
 }
 
 func updateStats(summary *statsSummary, record statsRecord) {
 	if record.isConnFail || record.isErr {
-		summary.errors++
+		summary.errorCount++
+	}
+
+	if record.err != nil {
+		summary.errors = append(summary.errors, record.err)
 	}
 
 	if summary.min < 0 || record.latency < summary.min {
@@ -208,9 +214,18 @@ func printStats(requests int, summary *statsSummary, outFmt string) {
 	log.Printf("============\n")
 	log.Printf("Test name:\t%s", summary.name)
 	log.Printf("Time taken for tests:\t%v", summary.total)
-	log.Printf("Complete requests:\t%v", requests-summary.errors)
-	log.Printf("Failed requests:\t%v", summary.errors)
 	log.Printf("Requests per second:\t%v", summary.rps)
+	log.Printf("Complete requests:\t%v", requests-summary.errorCount)
+	log.Printf("Failed requests:\t%v", summary.errorCount)
+
+	if len(summary.errors) > 0 {
+		log.Print("Failures:")
+
+		for _, err := range summary.errors {
+			log.Printf("\t%v", err)
+		}
+	}
+
 	log.Printf("\n")
 
 	if summary.mixedSize {
@@ -306,13 +321,16 @@ func GetCatalog(
 
 			var latency time.Duration
 
+			var err error
+
 			defer func() {
 				// send a stats record
 				statsCh <- statsRecord{
 					latency:    latency,
 					statusCode: statusCode,
 					isConnFail: isConnFail,
 					isErr:      isErr,
+					err:        err,
 				}
 			}()
 
@@ -749,7 +767,7 @@ func Perf(
 
 		printStats(requests, &summary, outFmt)
 
-		if summary.errors != 0 && !zbError {
+		if summary.errorCount != 0 && !zbError {
 			zbError = true
 		}
 	}