sync: 同步 v1.0.4 开源代码并脱敏

internal/batch/runtime.go

@@ -8,6 +8,7 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 
+	"git.5iot.com/iotlcm-public/iotlcm-worker-svr/internal/library/batchfields"
 	"git.5iot.com/iotlcm-public/iotlcm-worker-svr/internal/model/entity"
 )
 
@@ -84,9 +85,6 @@ func (r *Runtime) Handle(ctx context.Context, message Message) error {
 	}
 	if main.BatchAsyncStatus != AsyncStatusPending {
 		if main.BatchAsyncStatus == AsyncStatusProcessing {
-			if message.Retryable {
-				return r.reclaimAndExecute(ctx, message, executor, main)
-			}
 			if processingExecutor, ok := executor.(ProcessingExecutor); ok {
 				canExecute, checkErr := processingExecutor.CanExecuteProcessing(ctx, main)
 				if checkErr != nil {
@@ -98,6 +96,8 @@ func (r *Runtime) Handle(ctx context.Context, message Message) error {
 					}
 					return r.reclaimAndExecute(ctx, message, executor, main)
 				}
+			} else if message.Retryable {
+				return r.reclaimAndExecute(ctx, message, executor, main)
 			}
 		}
 		logUnclaimable(ctx, main)
@@ -168,9 +168,19 @@ func (r *Runtime) execute(ctx context.Context, message Message, executor Executo
 }
 
 func (r *Runtime) markExecutionFailed(ctx context.Context, message Message, executor Executor, reason string) error {
+	reason = batchfields.FailureReason(reason)
 	finalizationCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), r.finalizationTimeout)
 	defer cancel()
 
+	if handler, ok := executor.(DurableFailureHandler); ok {
+		handled, err := handler.ProtectExecutionFailure(finalizationCtx, message.BatchNo, message.BatchType, reason)
+		if err != nil {
+			return &FailureMarkError{Reason: reason, Err: err}
+		}
+		if handled {
+			return nil
+		}
+	}
 	failed, markErr := r.repository.MarkFailed(finalizationCtx, message.BatchNo, message.BatchType, reason)
 	if markErr != nil {
 		return &FailureMarkError{Reason: reason, Err: markErr}