Do not send rollback when there is no tx in server (#641)

reshke · web-flow · commit a79042758bc2 · 2024-04-27T15:50:26.000+05:00
diff --git a/pkg/datashard/datashard.go b/pkg/datashard/datashard.go
@@ -303,8 +303,10 @@ func (sh *Conn) fire(q string) error {
 // TODO : unit tests
 func (sh *Conn) Cleanup(rule *config.FrontendRule) error {
 	if rule.PoolRollback {
-		if err := sh.fire("ROLLBACK"); err != nil {
-			return err
+		if sh.TxStatus() != txstatus.TXIDLE {
+			if err := sh.fire("ROLLBACK"); err != nil {
+				return err
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -303,8 +303,10 @@ func (sh *Conn) fire(q string) error {`
`303`	`303`	`// TODO : unit tests`
`304`	`304`	`func (sh Conn) Cleanup(rule config.FrontendRule) error {`
`305`	`305`	`if rule.PoolRollback {`
`306`		`- if err := sh.fire("ROLLBACK"); err != nil {`
`307`		`- return err`
	`306`	`+ if sh.TxStatus() != txstatus.TXIDLE {`
	`307`	`+ if err := sh.fire("ROLLBACK"); err != nil {`
	`308`	`+ return err`
	`309`	`+ }`
`308`	`310`	`}`
`309`	`311`	`}`
`310`	`312`