don't retry operations that have conflict error

If an operation receives a conflict error from the blockchain connector, currently it will continutally retry submitting that operation but it will never succeed. Instead, we shouldn't retry if we know the connector has received the submission. Signed-off-by: Alex Shorsher <[email protected]>
hyperledger · Oct 30, 2024 · 68ad190 · 68ad190
1 parent 1939b67
commit 68ad190
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/internal/batch/batch_processor.go b/internal/batch/batch_processor.go
@@ -633,6 +633,11 @@ func (bp *batchProcessor) dispatchBatch(payload *DispatchPayload) error {
 						}
 					}
 				}
+				conflictErr, conflictTestOk := err.(operations.ConflictError)
+				if conflictTestOk && conflictErr.IsConflictError() {
+					// We know that the connector has received our batch, so we shouldn't need to retry
+					return true, nil
+				}
 			} else {
 				if core.IsPinned(payload.Batch.TX.Type) {
 					payload.addMessageUpdate(payload.Messages, core.MessageStateReady, core.MessageStateSent)