mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-22 05:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fail to start if we get a non-uniqueconstraint error

Browse source
This commit is contained in:
Till Faelligen 2022-09-11 09:32:26 +02:00
parent 240d00e2b6
commit d7171e1483
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
4 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
keyserver/storage/postgres/key_changes_table.go
View file

@ -18,8 +18,7 @@ import (
"context" "context"
"database/sql" "database/sql"
"errors" "errors"
"fmt"
"github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/internal" "github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/dendrite/internal/sqlutil"
@ -81,8 +80,7 @@ func executeMigration(ctx context.Context, db *sql.DB) error {
if err != nil { if err != nil {
if errors.Is(err, sql.ErrNoRows) { // migration was already executed, as the column was removed if errors.Is(err, sql.ErrNoRows) { // migration was already executed, as the column was removed
if err = sqlutil.InsertMigration(ctx, db, migrationName); err != nil { if err = sqlutil.InsertMigration(ctx, db, migrationName); err != nil {
// not a fatal error, log and continue return fmt.Errorf("unable to manually insert migration '%s': %w", migrationName, err)
logrus.WithError(err).Warnf("unable to manually insert migration '%s'", migrationName)
} }
return nil return nil
} }

6
keyserver/storage/sqlite3/key_changes_table.go
View file

@ -18,8 +18,7 @@ import (
"context" "context"
"database/sql" "database/sql"
"errors" "errors"
"fmt"
"github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/internal" "github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/dendrite/internal/sqlutil"
@ -80,8 +79,7 @@ func executeMigration(ctx context.Context, db *sql.DB) error {
if err != nil { if err != nil {
if errors.Is(err, sql.ErrNoRows) { // migration was already executed, as the column was removed if errors.Is(err, sql.ErrNoRows) { // migration was already executed, as the column was removed
if err = sqlutil.InsertMigration(ctx, db, migrationName); err != nil { if err = sqlutil.InsertMigration(ctx, db, migrationName); err != nil {
// not a fatal error, log and continue return fmt.Errorf("unable to manually insert migration '%s': %w", migrationName, err)
logrus.WithError(err).Warnf("unable to manually insert migration '%s'", migrationName)
} }
return nil return nil
} }

5
roomserver/storage/postgres/storage.go
View file

@ -21,8 +21,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/sirupsen/logrus"
// Import the postgres database driver. // Import the postgres database driver.
_ "github.com/lib/pq" _ "github.com/lib/pq"
@ -79,8 +77,7 @@ func executeMigration(ctx context.Context, db *sql.DB) error {
if err != nil { if err != nil {
if errors.Is(err, sql.ErrNoRows) { // migration was already executed, as the column was removed if errors.Is(err, sql.ErrNoRows) { // migration was already executed, as the column was removed
if err = sqlutil.InsertMigration(ctx, db, migrationName); err != nil { if err = sqlutil.InsertMigration(ctx, db, migrationName); err != nil {
// not a fatal error, log and continue return fmt.Errorf("unable to manually insert migration '%s': %w", migrationName, err)
logrus.WithError(err).Warnf("unable to manually insert migration '%s'", migrationName)
} }
return nil return nil
} }

4
roomserver/storage/sqlite3/storage.go
View file

@ -22,7 +22,6 @@ import (
"fmt" "fmt"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/internal/caching" "github.com/matrix-org/dendrite/internal/caching"
"github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/dendrite/internal/sqlutil"
@ -87,8 +86,7 @@ func executeMigration(ctx context.Context, db *sql.DB) error {
if err != nil { if err != nil {
if errors.Is(err, sql.ErrNoRows) { // migration was already executed, as the column was removed if errors.Is(err, sql.ErrNoRows) { // migration was already executed, as the column was removed
if err = sqlutil.InsertMigration(ctx, db, migrationName); err != nil { if err = sqlutil.InsertMigration(ctx, db, migrationName); err != nil {
// not a fatal error, log and continue return fmt.Errorf("unable to manually insert migration '%s': %w", migrationName, err)
logrus.WithError(err).Warnf("unable to manually insert migration '%s'", migrationName)
} }
return nil return nil
} }