Don't complete bury pushback errs

transparency-dev · Aug 1, 2024 · 754034b · 754034b
1 parent 64b4844
commit 754034b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/hammer/hammer.go b/hammer/hammer.go
@@ -156,11 +156,22 @@ func (h *Hammer) Run(ctx context.Context) {
 
 	// Set up logging for any errors
 	go func() {
+		tick := time.NewTicker(time.Second)
+		pbCount := 0
 		for {
 			select {
 			case <-ctx.Done(): //context cancelled
 				return
+			case <-tick.C:
+				if pbCount > 0 {
+					klog.Warningf("%d requests received pushback from log")
+					pbCount = 0
+				}
 			case err := <-h.errChan:
+				if errors.Is(err, ErrRetry) {
+					pbCount++
+					continue
+				}
 				klog.Warning(err)
 			}
 		}

diff --git a/hammer/workers.go b/hammer/workers.go
@@ -201,9 +201,7 @@ func (w *LogWriter) Run(ctx context.Context) {
 		lt := leafTime{queuedAt: time.Now()}
 		index, err := w.writer(ctx, newLeaf)
 		if err != nil {
-			if !errors.Is(ErrRetry, err) {
-				w.errChan <- fmt.Errorf("failed to create request: %w", err)
-			}
+			w.errChan <- fmt.Errorf("failed to create request: %w", err)
 			continue
 		}
 		lt.idx, lt.assignedAt = index, time.Now()