foo.diff

diff --git a/go/vt/vttablet/tabletserver/tx_pool.go b/go/vt/vttablet/tabletserver/tx_pool.go
index e7ecfcc51..2e24c87be 100644
--- a/go/vt/vttablet/tabletserver/tx_pool.go
+++ b/go/vt/vttablet/tabletserver/tx_pool.go
@@ -430,6 +430,7 @@ type TxConnection struct {
 	ImmediateCallerID *querypb.VTGateCallerID
 	EffectiveCallerID *vtrpcpb.CallerID
 	Autocommit        bool
+	concludeMu 		  sync.Mutex
 }
 
 func newTxConnection(conn *connpool.DBConn, transactionID int64, pool *TxPool, immediate *querypb.VTGateCallerID, effective *vtrpcpb.CallerID, autocommit bool) *TxConnection {
@@ -491,6 +492,13 @@ func (txc *TxConnection) RecordQuery(query string) {
 }
 
 func (txc *TxConnection) conclude(conclusion, reason string) {
+	txc.concludeMu.Lock()
+	defer txc.concludeMu.Unlock()
+	if (txc.DBConn == nil) {
+		// Another process already concluded this connection. Bail to avoid a go panic.
+		return
+	}
+
 	txc.pool.activePool.Unregister(txc.TransactionID, reason)
 	txc.DBConn.Recycle()
 	txc.DBConn = nil