From 9ca9a7c30299a5959056ea40d110ac50bd80d06b Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 12 Jun 2018 22:58:03 +0200
Subject: [PATCH] bus: dont start transaction when creating session

---
 pkg/services/sqlstore/session.go      | 1 -
 pkg/services/sqlstore/transactions.go | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/services/sqlstore/session.go b/pkg/services/sqlstore/session.go
index 307d3ee1eeb..fdee2c76b0c 100644
--- a/pkg/services/sqlstore/session.go
+++ b/pkg/services/sqlstore/session.go
@@ -29,7 +29,6 @@ func startSession(ctx context.Context) *DBSession {
 
 	if !ok {
 		newSess := newSession()
-		newSess.Begin()
 		return newSess
 	}
 
diff --git a/pkg/services/sqlstore/transactions.go b/pkg/services/sqlstore/transactions.go
index 959d21c0bf1..f72b0bb8500 100644
--- a/pkg/services/sqlstore/transactions.go
+++ b/pkg/services/sqlstore/transactions.go
@@ -17,6 +17,10 @@ func (ss *SqlStore) inTransactionWithRetry(ctx context.Context, fn func(ctx cont
 	sess := startSession(ctx)
 	defer sess.Close()
 
+	if err := sess.Begin(); err != nil {
+		return err
+	}
+
 	withValue := context.WithValue(ctx, ContextSessionName, sess)
 
 	err := fn(withValue)
@@ -59,6 +63,7 @@ func inTransactionWithRetryCtx(ctx context.Context, callback dbTransactionFunc,
 	var err error
 
 	sess := startSession(ctx)
+
 	defer sess.Close()
 
 	if err = sess.Begin(); err != nil {