From 100fa9b2354efa05b4fbff3a3cb745ea7783d41c Mon Sep 17 00:00:00 2001
From: Till <2353100+S7evinK@users.noreply.github.com>
Date: Tue, 13 Sep 2022 08:07:43 +0200
Subject: Check unique constraint errors when manually inserting migrations
 (#2712)

This should avoid unnecessary logging on startup if the migration (were
we need `InsertMigration`) was already executed.
This now checks for "unique constraint errors" for SQLite and Postgres
and fails the startup process if the migration couldn't be manually
inserted for some other reason.
---
 keyserver/storage/postgres/key_changes_table.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'keyserver/storage/postgres/key_changes_table.go')

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