Skip to content

Commit b84477e

Browse files
authored
Merge pull request #1493 from ydb-platform/fix-slo-logs
fixed last error messages
2 parents 94458f2 + a4e89c5 commit b84477e

File tree

2 files changed

+30
-14
lines changed

2 files changed

+30
-14
lines changed

tests/slo/internal/workers/read.go

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,24 @@ import (
1414
func (w *Workers) Read(ctx context.Context, wg *sync.WaitGroup, rl *rate.Limiter) {
1515
defer wg.Done()
1616
for {
17-
err := rl.Wait(ctx)
18-
if err != nil {
17+
select {
18+
case <-ctx.Done():
1919
return
20+
default:
21+
err := rl.Wait(ctx)
22+
if err != nil {
23+
return
24+
}
25+
26+
err = w.read(ctx)
27+
if err != nil {
28+
if ctxErr := ctx.Err(); ctxErr == nil {
29+
log.Printf("read failed: %v", err)
30+
}
31+
32+
return
33+
}
2034
}
21-
22-
_ = w.read(ctx)
2335
}
2436
}
2537

@@ -29,9 +41,6 @@ func (w *Workers) read(ctx context.Context) error {
2941
m := w.m.Start(metrics.JobRead)
3042

3143
_, attempts, err := w.s.Read(ctx, id)
32-
if err != nil {
33-
log.Printf("read failed with %d attempts: %v", attempts, err)
34-
}
3544

3645
m.Finish(err, attempts)
3746

tests/slo/internal/workers/write.go

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,22 @@ import (
1414
func (w *Workers) Write(ctx context.Context, wg *sync.WaitGroup, rl *rate.Limiter, gen *generator.Generator) {
1515
defer wg.Done()
1616
for {
17-
err := rl.Wait(ctx)
18-
if err != nil {
17+
select {
18+
case <-ctx.Done():
1919
return
20+
default:
21+
err := rl.Wait(ctx)
22+
if err != nil {
23+
return
24+
}
25+
26+
err = w.write(ctx, gen)
27+
if err != nil {
28+
if ctxErr := ctx.Err(); ctxErr == nil {
29+
log.Printf("write failed: %v", err)
30+
}
31+
}
2032
}
21-
22-
_ = w.write(ctx, gen)
2333
}
2434
}
2535

@@ -34,9 +44,6 @@ func (w *Workers) write(ctx context.Context, gen *generator.Generator) error {
3444
m := w.m.Start(metrics.JobWrite)
3545

3646
attempts, err := w.s.Write(ctx, row)
37-
if err != nil {
38-
log.Printf("write failed with %d attempts: %v", attempts, err)
39-
}
4047

4148
m.Finish(err, attempts)
4249

0 commit comments

Comments
 (0)