From 04617c14687bdb5e0795937edd73c1a6c1157830 Mon Sep 17 00:00:00 2001 From: lysu Date: Fri, 27 Dec 2019 21:17:12 +0800 Subject: [PATCH] executor: add rollback in `releaseSysSession` --- executor/simple.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/executor/simple.go b/executor/simple.go index 0137cd750ec9f..7757d9cc43262 100644 --- a/executor/simple.go +++ b/executor/simple.go @@ -74,8 +74,15 @@ func (e *SimpleExec) getSysSession() (sessionctx.Context, error) { } func (e *SimpleExec) releaseSysSession(ctx sessionctx.Context) { + if ctx == nil { + return + } dom := domain.GetDomain(e.ctx) sysSessionPool := dom.SysSessionPool() + if _, err := ctx.(sqlexec.SQLExecutor).Execute(context.Background(), "rollback"); err != nil { + ctx.(pools.Resource).Close() + return + } sysSessionPool.Put(ctx.(pools.Resource)) }