Merge pull request #369 from ydb-platform/revert-context

revert context errors as required delete session

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Revert the marking of context errors as required to delete session
+
 ## v3.37.3
 * Fixed alter topic request - stop send empty setSupportedCodecs if customer not set them 
 * Marked the context errors as required to delete session

internal/retry/check.go

@@ -1,8 +1,6 @@
 package retry
 
 import (
-	"context"
-
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/backoff"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/operation"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
@@ -16,15 +14,12 @@ func Check(err error) (
 	deleteSession bool,
 ) {
 	var e xerrors.Error
-	switch {
-	case xerrors.As(err, &e):
-		return int64(e.Code()), e.OperationStatus(), e.BackoffType(), e.MustDeleteSession()
-
-	// context errors with explicit delete session
-	case xerrors.Is(err, context.Canceled), xerrors.Is(err, context.DeadlineExceeded):
-		return int64(-1), operation.Finished, backoff.TypeNoBackoff, true
+	if xerrors.As(err, &e) {
+		return int64(e.Code()),
+			e.OperationStatus(),
+			e.BackoffType(),
+			e.MustDeleteSession()
 	}
-
 	return -1,
 		operation.Finished, // it's finished, not need any retry attempts
 		backoff.TypeNoBackoff,
@@ -33,17 +28,10 @@ func Check(err error) (
 
 func MustDeleteSession(err error) bool {
 	var e xerrors.Error
-	switch {
-	case xerrors.As(err, &e):
+	if xerrors.As(err, &e) {
 		return e.MustDeleteSession()
-
-	// context errors with explicit delete session
-	case xerrors.Is(err, context.Canceled), xerrors.Is(err, context.DeadlineExceeded):
-		return true
-
-	default:
-		return false
 	}
+	return false
 }
 
 func MustRetry(err error, isOperationIdempotent bool) bool {

internal/xtest/grpclogger.go

@@ -8,7 +8,7 @@ import (
 	"google.golang.org/grpc"
 )
 
-var globalLastStreamID int64 = 0
+var globalLastStreamID = int64(0)
 
 // GrpcLogger use for log raw grpc messages
 //

retry/errors_data_test.go

@@ -47,7 +47,7 @@ var errsToCheck = []struct {
 		// golang context deadline exceeded
 		err:           context.DeadlineExceeded,
 		backoff:       backoff.TypeNoBackoff,
-		deleteSession: true,
+		deleteSession: false,
 		canRetry: map[idempotency]bool{
 			idempotent:    false,
 			nonIdempotent: false,
@@ -57,7 +57,7 @@ var errsToCheck = []struct {
 		// golang context canceled
 		err:           context.Canceled,
 		backoff:       backoff.TypeNoBackoff,
-		deleteSession: true,
+		deleteSession: false,
 		canRetry: map[idempotency]bool{
 			idempotent:    false,
 			nonIdempotent: false,