retry on batches

aerospike · Aug 18, 2024 · e68dc38 · e68dc38
1 parent 07bbd78
commit e68dc38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/io/aerospike/record_batch_writer.go b/io/aerospike/record_batch_writer.go
@@ -85,12 +85,12 @@ func (rw *batchRecordWriter) flushBuffer() error {
 	for attemptsLeft(rw.retryPolicy, attempt) {
 		err := rw.asc.BatchOperate(nil, rw.operationBuffer)
 
-		if err == nil || isAcceptableError(err) {
+		if isNilOrAcceptableError(err) {
 			rw.operationBuffer = rw.processAndFilterOperations()
 			if len(rw.operationBuffer) == 0 {
 				return nil // All operations succeeded
 			}
-		} else if err != nil && !shouldRetry(err) {
+		} else if !shouldRetry(err) {
 			return fmt.Errorf("non-retryable error on restore: %w", err)
 		}
 

diff --git a/io/aerospike/record_writer.go b/io/aerospike/record_writer.go
@@ -59,7 +59,7 @@ func (rw *singleRecordWriter) executeWrite(writePolicy *a.WritePolicy, record *m
 			return nil
 		}
 
-		if isAcceptableError(aerr) {
+		if isNilOrAcceptableError(aerr) {
 			switch {
 			case aerr.Matches(atypes.GENERATION_ERROR):
 				rw.stats.IncrRecordsFresher()

diff --git a/io/aerospike/restore_writer.go b/io/aerospike/restore_writer.go
@@ -131,12 +131,12 @@ func sleep(rc *models.RetryPolicy, attempt int) {
 	time.Sleep(duration)
 }
 
-func isAcceptableError(err a.Error) bool {
-	return err.Matches(atypes.GENERATION_ERROR, atypes.KEY_EXISTS_ERROR)
+func isNilOrAcceptableError(err a.Error) bool {
+	return err == nil || err.Matches(atypes.GENERATION_ERROR, atypes.KEY_EXISTS_ERROR)
 }
 
 func shouldRetry(err a.Error) bool {
-	return err.Matches(
+	return err != nil && err.Matches(
 		atypes.NO_AVAILABLE_CONNECTIONS_TO_NODE,
 		atypes.TIMEOUT,
 		atypes.DEVICE_OVERLOAD,