luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove timeout from MySQL migrations (#2974)

Browse source
This commit is contained in:
Miguel de la Cruz 2022-04-28 19:58:17 +02:00 committed by GitHub
parent 2a0873c954
commit c08ce96076
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
server/services/store/sqlstore/migrate.go
View file

@ -57,6 +57,16 @@ func appendMultipleStatementsFlag(connectionString string) (string, error) {
return config.FormatDSN(), nil return config.FormatDSN(), nil
} }
// resetReadTimeout removes the timeout contraint from the MySQL dsn.
func resetReadTimeout(dataSource string) (string, error) {
config, err := mysqldriver.ParseDSN(dataSource)
if err != nil {
return "", err
}
config.ReadTimeout = 0
return config.FormatDSN(), nil
}
// migrations in MySQL need to run with the multiStatements flag // migrations in MySQL need to run with the multiStatements flag
// enabled, so this method creates a new connection ensuring that it's // enabled, so this method creates a new connection ensuring that it's
// enabled. // enabled.
@ -64,7 +74,12 @@ func (s *SQLStore) getMigrationConnection() (*sql.DB, error) {
connectionString := s.connectionString connectionString := s.connectionString
if s.dbType == model.MysqlDBType { if s.dbType == model.MysqlDBType {
var err error var err error
connectionString, err = appendMultipleStatementsFlag(s.connectionString) connectionString, err = resetReadTimeout(connectionString)
if err != nil {
return nil, err
}
connectionString, err = appendMultipleStatementsFlag(connectionString)
if err != nil { if err != nil {
return nil, err return nil, err
} }