[SAPBTPCFS-7876] Optimize handling of non-transient errors

SAP · Dec 4, 2023 · d1e9565 · d1e9565
1 parent 1469afe
commit d1e9565
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/controllers/base_controller.go b/controllers/base_controller.go
@@ -325,7 +325,7 @@ func isTransientError(smError *sm.ServiceManagerError, log logr.Logger, resource
 	log.Info(fmt.Sprintf("SM returned error with status code %d", statusCode))
 	isTransient := isTransientStatusCode(statusCode) || isConcurrentOperationError(smError)
 	annotations := resource.GetAnnotations()
-	if !isTransient && statusCode == http.StatusBadRequest && annotations != nil {
+	if !isTransient && statusCode != http.StatusInternalServerError && annotations != nil {
 		if _, ok := annotations[api.IgnoreNonTransientErrorAnnotation]; ok {
 			log.Info("ignoreNonTransientErrorAnnotation checking timeout")
 			timeoutReached := true
@@ -379,10 +379,6 @@ func (r *BaseReconciler) markAsNonTransientError(ctx context.Context, operationT
 	if err != nil {
 		return ctrl.Result{}, err
 	}
-	err = r.removeIgnoreNonTransientErrorAnnotation(ctx, object)
-	if err != nil {
-		return ctrl.Result{}, err
-	}
 	if operationType == smClientTypes.DELETE {
 		return ctrl.Result{}, fmt.Errorf(errMsg)
 	}