IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: fix postgres migration on conflict (#35556)

Browse Source
This commit is contained in:
Sofia Papagiannaki 2021-06-14 16:43:33 +03:00 committed by GitHub
parent 4cb62e4292
commit 423474325a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/services/sqlstore/migrations/ualert/ualert.go
View File

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"os" "os"
"strings"
pb "github.com/prometheus/alertmanager/silence/silencepb" pb "github.com/prometheus/alertmanager/silence/silencepb"
"xorm.io/xorm" "xorm.io/xorm"
@ -217,7 +218,14 @@ func (m *migration) Exec(sess *xorm.Session, mg *migrator.Migrator) error {
return err return err
} }
_, err = m.sess.Insert(rule) if strings.HasPrefix(mg.Dialect.DriverName(), migrator.Postgres) {
err = mg.InTransaction(func(sess *xorm.Session) error {
_, err = sess.Insert(rule)
return err
})
} else {
_, err = m.sess.Insert(rule)
}
if err != nil { if err != nil {
// TODO better error handling, if constraint // TODO better error handling, if constraint
rule.Title += fmt.Sprintf(" %v", rule.Uid) rule.Title += fmt.Sprintf(" %v", rule.Uid)

4
pkg/services/sqlstore/migrator/migrator.go
View File

@ -103,7 +103,7 @@ func (mg *Migrator) Start() error {
Timestamp: time.Now(), Timestamp: time.Now(),
} }
err := mg.inTransaction(func(sess *xorm.Session) error { err := mg.InTransaction(func(sess *xorm.Session) error {
err := mg.exec(m, sess) err := mg.exec(m, sess)
if err != nil { if err != nil {
mg.Logger.Error("Exec failed", "error", err, "sql", sql) mg.Logger.Error("Exec failed", "error", err, "sql", sql)
@ -183,7 +183,7 @@ func (mg *Migrator) ClearMigrationEntry(id string) error {
type dbTransactionFunc func(sess *xorm.Session) error type dbTransactionFunc func(sess *xorm.Session) error
func (mg *Migrator) inTransaction(callback dbTransactionFunc) error { func (mg *Migrator) InTransaction(callback dbTransactionFunc) error {
sess := mg.x.NewSession() sess := mg.x.NewSession()
defer sess.Close() defer sess.Close()