Merge pull request #5318 from onflow/petera/script-exec-failover-always

[Access] Always failover to EN on script exec err - v0.32
onflow · Jan 30, 2024 · a8bc12d · a8bc12d
2 parents ed7eec5 + 289cd3c
commit a8bc12d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/engine/access/rpc/backend/backend_scripts.go b/engine/access/rpc/backend/backend_scripts.go
@@ -128,7 +128,10 @@ func (b *backendScripts) executeScript(
 
 	case IndexQueryModeFailover:
 		localResult, localDuration, localErr := b.executeScriptLocally(ctx, scriptRequest)
-		if localErr == nil || isInvalidArgumentError(localErr) || status.Code(localErr) == codes.Canceled {
+		// Note: temporarily ignoring error types and falling back to ENs for ALL errors
+		// This should only fallback for non-cadence errors, but on v0.32, some errors are hidden
+		// within a cadence runtime error, resulting in the incorrect error type being returned.
+		if localErr == nil || status.Code(localErr) == codes.Canceled {
 			return localResult, localErr
 		}
 		// Note: scripts that timeout are retried on the execution nodes since ANs may have performance

diff --git a/engine/access/rpc/backend/backend_scripts_test.go b/engine/access/rpc/backend/backend_scripts_test.go
@@ -338,10 +338,11 @@ func (s *BackendScriptsSuite) TestExecuteScriptWithFailover_SkippedForCorrectCod
 		err        error
 		statusCode codes.Code
 	}{
-		{
-			err:        cadenceErr,
-			statusCode: codes.InvalidArgument,
-		},
+		// Skipping failover for InvalidArgument temporarily disabled
+		// {
+		// 	err:        cadenceErr,
+		// 	statusCode: codes.InvalidArgument,
+		// },
 		{
 			err:        ctxCancelErr,
 			statusCode: codes.Canceled,