Skip to content

Commit 7c280f4

Browse files
committed
incusd/db: Improve readability with eraly return
Signed-off-by: Lucas Bremgartner <[email protected]>
1 parent f64535f commit 7c280f4

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

internal/server/db/query/retry.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,19 @@ func Retry(ctx context.Context, f func(ctx context.Context) error) error {
3838
}
3939

4040
// Process actual errors.
41-
if IsRetriableError(err) {
42-
if i == maxRetries {
43-
logger.Warn("Database error, giving up", logger.Ctx{"attempt": i, "err": err})
44-
break
45-
}
46-
47-
logger.Debug("Database error, retrying", logger.Ctx{"attempt": i, "err": err})
48-
time.Sleep(jitter.Deviation(nil, 0.8)(100 * time.Millisecond))
49-
continue
50-
} else {
41+
if !IsRetriableError(err) {
5142
logger.Debug("Database error", logger.Ctx{"err": err})
43+
break
5244
}
45+
46+
if i == maxRetries {
47+
logger.Warn("Database error, giving up", logger.Ctx{"attempt": i, "err": err})
48+
break
49+
}
50+
51+
logger.Debug("Database error, retrying", logger.Ctx{"attempt": i, "err": err})
52+
time.Sleep(jitter.Deviation(nil, 0.8)(100 * time.Millisecond))
53+
continue
5354
}
5455
break
5556
}

0 commit comments

Comments
 (0)