Merge pull request #806 from ydb-platform/rollback

* Added checking condition for `tx.Rollback()` in `retry.DoTx`

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Added checking condition for `tx.Rollback()` in `retry.DoTx`
+
 ## v3.51.0
 * Added node info to grpc errors
 

internal/table/retry.go

@@ -76,7 +76,15 @@ func doTx(
 
 			defer func() {
 				if err != nil {
-					_ = tx.Rollback(ctx)
+					errRollback := tx.Rollback(ctx)
+					if errRollback != nil {
+						err = xerrors.NewWithIssues("",
+							xerrors.WithStackTrace(err),
+							xerrors.WithStackTrace(errRollback),
+						)
+					} else {
+						err = xerrors.WithStackTrace(err)
+					}
 				}
 			}()
 

internal/xerrors/issues.go

@@ -76,8 +76,12 @@ func (e *errorWithIssues) isYdbError() {}
 
 func (e *errorWithIssues) Error() string {
 	var b bytes.Buffer
-	b.WriteString(e.reason)
-	b.WriteString(", issues: [")
+	if len(e.reason) > 0 {
+		b.WriteString(e.reason)
+		b.WriteString(", issues: [")
+	} else {
+		b.WriteString("multiple errors: [")
+	}
 	for i, issue := range e.issues {
 		if i != 0 {
 			b.WriteString(", ")

retry/sql.go

@@ -107,7 +107,17 @@ func DoTx(ctx context.Context, db *sql.DB, f func(context.Context, *sql.Tx) erro
 			return unwrapErrBadConn(xerrors.WithStackTrace(err))
 		}
 		defer func() {
-			_ = tx.Rollback()
+			if err != nil {
+				errRollback := tx.Rollback()
+				if errRollback != nil {
+					err = xerrors.NewWithIssues("",
+						xerrors.WithStackTrace(err),
+						xerrors.WithStackTrace(errRollback),
+					)
+				} else {
+					err = xerrors.WithStackTrace(err)
+				}
+			}
 		}()
 		if err = f(ctx, tx); err != nil {
 			return unwrapErrBadConn(xerrors.WithStackTrace(err))