IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-18 20:43:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

sqlite: fixed database table looked handling, now retries up to 5 times, fixes #7992

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-15 12:19:19 +02:00
parent fd969bf659
commit f697f81950
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/services/sqlstore/shared.go
View File

@ -1,9 +1,12 @@
package sqlstore
import (
"time"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
sqlite3 "github.com/mattn/go-sqlite3"
)
type dbTransactionFunc func(sess *xorm.Session) error
@ -19,6 +22,10 @@ func (sess *session) publishAfterCommit(msg interface{}) {
}
func inTransaction(callback dbTransactionFunc) error {
return inTransactionWithRetry(callback, 0)
}
func inTransactionWithRetry(callback dbTransactionFunc, retry int) error {
var err error
sess := x.NewSession()
@ -30,6 +37,16 @@ func inTransaction(callback dbTransactionFunc) error {
err = callback(sess)
// special handling of database locked errors for sqlite, then we can retry 3 times
if sqlError, ok := err.(sqlite3.Error); ok && retry < 5 {
if sqlError.Code == sqlite3.ErrLocked {
sess.Rollback()
time.Sleep(time.Millisecond * time.Duration(10))
sqlog.Info("Database table locked, sleeping then retrying", "retry", retry)
return inTransactionWithRetry(callback, retry+1)
}
}
if err != nil {
sess.Rollback()
return err