mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-30 18:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixup postgres migration on fresh dendrite instances

Browse source
This commit is contained in:
Kegan Dougal 2022-01-20 18:48:56 +00:00
parent 031cc1876d
commit e0147b04c1
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
keyserver/storage/postgres/deltas/2022012016470000_key_changes.go
View file

@ -20,7 +20,6 @@ import (
"github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/pressly/goose" "github.com/pressly/goose"
"github.com/sirupsen/logrus"
) )
func LoadFromGoose() { func LoadFromGoose() {
@ -32,12 +31,18 @@ func LoadRefactorKeyChanges(m *sqlutil.Migrations) {
} }
func UpRefactorKeyChanges(tx *sql.Tx) error { func UpRefactorKeyChanges(tx *sql.Tx) error {
logrus.Infof("running delta!") // start counting from the last max offset, else 0. We need to do a count(*) first to see if there
// start counting from the last max offset, else 0. // even are entries in this table to know if we can query for log_offset. Without the count then
var maxOffset int64 // the query to SELECT the max log offset fails on new Dendrite instances as log_offset doesn't
_ = tx.QueryRow(`SELECT coalesce(MAX(log_offset), 0) AS offset FROM keyserver_key_changes`).Scan(&maxOffset) // exist on that table. Even though we discard the error, the txn is tainted and gets aborted :/
if _, err := tx.Exec(fmt.Sprintf(`CREATE SEQUENCE IF NOT EXISTS keyserver_key_changes_seq START %d`, maxOffset)); err != nil { var count int
return fmt.Errorf("failed to CREATE SEQUENCE for key changes, starting at %d: %s", maxOffset, err) _ = tx.QueryRow(`SELECT count(*) FROM keyserver_key_changes`).Scan(&count)
if count > 0 {
var maxOffset int64
_ = tx.QueryRow(`SELECT coalesce(MAX(log_offset), 0) AS offset FROM keyserver_key_changes`).Scan(&maxOffset)
if _, err := tx.Exec(fmt.Sprintf(`CREATE SEQUENCE IF NOT EXISTS keyserver_key_changes_seq START %d`, maxOffset)); err != nil {
return fmt.Errorf("failed to CREATE SEQUENCE for key changes, starting at %d: %s", maxOffset, err)
}
} }
_, err := tx.Exec(` _, err := tx.Exec(`