fixed last error messages

Author: asmyasnikov

tests/slo/internal/workers/read.go

@@ -14,12 +14,24 @@ import (
 func (w *Workers) Read(ctx context.Context, wg *sync.WaitGroup, rl *rate.Limiter) {
 	defer wg.Done()
 	for {
-		err := rl.Wait(ctx)
-		if err != nil {
+		select {
+		case <-ctx.Done():
 			return
+		default:
+			err := rl.Wait(ctx)
+			if err != nil {
+				return
+			}
+
+			err = w.read(ctx)
+			if err != nil {
+				if ctxErr := ctx.Err(); ctxErr == nil {
+					log.Printf("read failed: %v", err)
+				}
+
+				return
+			}
 		}
-
-		_ = w.read(ctx)
 	}
 }
 
@@ -29,9 +41,6 @@ func (w *Workers) read(ctx context.Context) error {
 	m := w.m.Start(metrics.JobRead)
 
 	_, attempts, err := w.s.Read(ctx, id)
-	if err != nil {
-		log.Printf("read failed with %d attempts: %v", attempts, err)
-	}
 
 	m.Finish(err, attempts)
 

tests/slo/internal/workers/write.go

@@ -14,12 +14,22 @@ import (
 func (w *Workers) Write(ctx context.Context, wg *sync.WaitGroup, rl *rate.Limiter, gen *generator.Generator) {
 	defer wg.Done()
 	for {
-		err := rl.Wait(ctx)
-		if err != nil {
+		select {
+		case <-ctx.Done():
 			return
+		default:
+			err := rl.Wait(ctx)
+			if err != nil {
+				return
+			}
+
+			err = w.write(ctx, gen)
+			if err != nil {
+				if ctxErr := ctx.Err(); ctxErr == nil {
+					log.Printf("write failed: %v", err)
+				}
+			}
 		}
-
-		_ = w.write(ctx, gen)
 	}
 }
 
@@ -34,9 +44,6 @@ func (w *Workers) write(ctx context.Context, gen *generator.Generator) error {
 	m := w.m.Start(metrics.JobWrite)
 
 	attempts, err := w.s.Write(ctx, row)
-	if err != nil {
-		log.Printf("write failed with %d attempts: %v", attempts, err)
-	}
 
 	m.Finish(err, attempts)