Merge pull request #1467 from sshaplygin/skip-rollback

rekby · web-flow · commit e59b43b5f23b · 2024-09-18T15:23:51.000+03:00
add: skip rollback
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Doesn't rollback a the transaction on the operation error in table service
+
 ## v3.80.6
 * Fixed concurrent map writes in metrics
 * Renamed method at experimental API reader.PopBatchTx to reader.PopMessagesBatchTx
diff --git a/internal/table/client.go b/internal/table/client.go
@@ -238,7 +238,7 @@ func (c *Client) DoTx(ctx context.Context, op table.TxOperation, opts ...table.O
 		}
 
 		defer func() {
-			if err != nil {
+			if err != nil && !xerrors.IsOperationError(err) {
 				_ = tx.Rollback(ctx)
 			}
 		}()

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+* Doesn't rollback a the transaction on the operation error in table service`
	`2`	`+`
`1`	`3`	`## v3.80.6`
`2`	`4`	`* Fixed concurrent map writes in metrics`
`3`	`5`	`* Renamed method at experimental API reader.PopBatchTx to reader.PopMessagesBatchTx`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ func (c *Client) DoTx(ctx context.Context, op table.TxOperation, opts ...table.O`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`defer func() {`
`241`		`- if err != nil {`
	`241`	`+ if err != nil && !xerrors.IsOperationError(err) {`
`242`	`242`	`_ = tx.Rollback(ctx)`
`243`	`243`	`}`
`244`	`244`	`}()`