after backoff wait

grpc-ecosystem · Mar 13, 2024 · 9f3c0de · 9f3c0de
1 parent 3c15d17
commit 9f3c0de
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/interceptors/retry/retry.go b/interceptors/retry/retry.go
@@ -37,12 +37,12 @@ func UnaryClientInterceptor(optFuncs ...CallOption) grpc.UnaryClientInterceptor
 		}
 		var lastErr error
 		for attempt := uint(0); attempt < callOpts.max; attempt++ {
-			if attempt > 0 {
-				callOpts.onRetryCallback(parentCtx, attempt, lastErr)
-			}
 			if err := waitRetryBackoff(attempt, parentCtx, callOpts); err != nil {
 				return err
 			}
+			if attempt > 0 {
+				callOpts.onRetryCallback(parentCtx, attempt, lastErr)
+			}
 			callCtx, cancel := perCallContext(parentCtx, callOpts, attempt)
 			defer cancel() // Clean up potential resources.
 			lastErr = invoker(callCtx, method, req, reply, cc, grpcOpts...)
@@ -93,12 +93,12 @@ func StreamClientInterceptor(optFuncs ...CallOption) grpc.StreamClientIntercepto
 
 		var lastErr error
 		for attempt := uint(0); attempt < callOpts.max; attempt++ {
-			if attempt > 0 {
-				callOpts.onRetryCallback(parentCtx, attempt, lastErr)
-			}
 			if err := waitRetryBackoff(attempt, parentCtx, callOpts); err != nil {
 				return nil, err
 			}
+			if attempt > 0 {
+				callOpts.onRetryCallback(parentCtx, attempt, lastErr)
+			}
 			var newStreamer grpc.ClientStream
 			newStreamer, lastErr = streamer(parentCtx, desc, cc, method, grpcOpts...)
 			if lastErr == nil {