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

Prepare after migration; fixup dendrite-upgrade-test logging

Browse source
This commit is contained in:
Kegan Dougal 2022-01-20 17:30:40 +00:00
parent dfedca9452
commit 00ab416bad
6 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/dendrite-upgrade-tests/main.go
View file

@ -189,7 +189,9 @@ func buildDendrite(httpClient *http.Client, dockerClient *client.Client, tmpDir,
if err := decoder.Decode(&dl); err != nil { if err := decoder.Decode(&dl); err != nil {
return "", fmt.Errorf("failed to decode build image output line: %w", err) return "", fmt.Errorf("failed to decode build image output line: %w", err)
} }
log.Printf("%s: %s", branchOrTagName, dl.Stream) if len(strings.TrimSpace(dl.Stream)) > 0 {
log.Printf("%s: %s", branchOrTagName, dl.Stream)
}
if dl.Aux != nil { if dl.Aux != nil {
imgID, ok := dl.Aux["ID"] imgID, ok := dl.Aux["ID"]
if ok { if ok {
@ -425,8 +427,10 @@ func cleanup(dockerClient *client.Client) {
// ignore all errors, we are just cleaning up and don't want to fail just because we fail to cleanup // ignore all errors, we are just cleaning up and don't want to fail just because we fail to cleanup
containers, _ := dockerClient.ContainerList(context.Background(), types.ContainerListOptions{ containers, _ := dockerClient.ContainerList(context.Background(), types.ContainerListOptions{
Filters: label(dendriteUpgradeTestLabel), Filters: label(dendriteUpgradeTestLabel),
All: true,
}) })
for _, c := range containers { for _, c := range containers {
log.Printf("Removing container: %v %v\n", c.ID, c.Names)
s := time.Second s := time.Second
_ = dockerClient.ContainerStop(context.Background(), c.ID, &s) _ = dockerClient.ContainerStop(context.Background(), c.ID, &s)
_ = dockerClient.ContainerRemove(context.Background(), c.ID, types.ContainerRemoveOptions{ _ = dockerClient.ContainerRemove(context.Background(), c.ID, types.ContainerRemoveOptions{

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

@ -57,16 +57,17 @@ func NewPostgresKeyChangesTable(db *sql.DB) (tables.KeyChanges, error) {
db: db, db: db,
} }
_, err := db.Exec(keyChangesSchema) _, err := db.Exec(keyChangesSchema)
if err != nil { return s, err
return nil, err }
func (s *keyChangesStatements) Prepare() (err error) {
if s.upsertKeyChangeStmt, err = s.db.Prepare(upsertKeyChangeSQL); err != nil {
return err
} }
if s.upsertKeyChangeStmt, err = db.Prepare(upsertKeyChangeSQL); err != nil { if s.selectKeyChangesStmt, err = s.db.Prepare(selectKeyChangesSQL); err != nil {
return nil, err return err
} }
if s.selectKeyChangesStmt, err = db.Prepare(selectKeyChangesSQL); err != nil { return nil
return nil, err
}
return s, nil
} }
func (s *keyChangesStatements) InsertKeyChange(ctx context.Context, userID string) (changeID int64, err error) { func (s *keyChangesStatements) InsertKeyChange(ctx context.Context, userID string) (changeID int64, err error) {

3
keyserver/storage/postgres/storage.go
View file

@ -57,6 +57,9 @@ func NewDatabase(dbProperties *config.DatabaseOptions) (*shared.Database, error)
if err = m.RunDeltas(db, dbProperties); err != nil { if err = m.RunDeltas(db, dbProperties); err != nil {
return nil, err return nil, err
} }
if err = kc.Prepare(); err != nil {
return nil, err
}
d := &shared.Database{ d := &shared.Database{
DB: db, DB: db,
Writer: sqlutil.NewDummyWriter(), Writer: sqlutil.NewDummyWriter(),

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

@ -58,16 +58,17 @@ func NewSqliteKeyChangesTable(db *sql.DB) (tables.KeyChanges, error) {
db: db, db: db,
} }
_, err := db.Exec(keyChangesSchema) _, err := db.Exec(keyChangesSchema)
if err != nil { return s, err
return nil, err }
func (s *keyChangesStatements) Prepare() (err error) {
if s.upsertKeyChangeStmt, err = s.db.Prepare(upsertKeyChangeSQL); err != nil {
return err
} }
if s.upsertKeyChangeStmt, err = db.Prepare(upsertKeyChangeSQL); err != nil { if s.selectKeyChangesStmt, err = s.db.Prepare(selectKeyChangesSQL); err != nil {
return nil, err return err
} }
if s.selectKeyChangesStmt, err = db.Prepare(selectKeyChangesSQL); err != nil { return nil
return nil, err
}
return s, nil
} }
func (s *keyChangesStatements) InsertKeyChange(ctx context.Context, userID string) (changeID int64, err error) { func (s *keyChangesStatements) InsertKeyChange(ctx context.Context, userID string) (changeID int64, err error) {

3
keyserver/storage/sqlite3/storage.go
View file

@ -56,6 +56,9 @@ func NewDatabase(dbProperties *config.DatabaseOptions) (*shared.Database, error)
if err = m.RunDeltas(db, dbProperties); err != nil { if err = m.RunDeltas(db, dbProperties); err != nil {
return nil, err return nil, err
} }
if err = kc.Prepare(); err != nil {
return nil, err
}
d := &shared.Database{ d := &shared.Database{
DB: db, DB: db,
Writer: sqlutil.NewExclusiveWriter(), Writer: sqlutil.NewExclusiveWriter(),

2
keyserver/storage/tables/interface.go
View file

@ -48,6 +48,8 @@ type KeyChanges interface {
// SelectKeyChanges returns the set (de-duplicated) of users who have changed their keys between the two offsets. // SelectKeyChanges returns the set (de-duplicated) of users who have changed their keys between the two offsets.
// Results are exclusive of fromOffset and inclusive of toOffset. A toOffset of sarama.OffsetNewest means no upper offset. // Results are exclusive of fromOffset and inclusive of toOffset. A toOffset of sarama.OffsetNewest means no upper offset.
SelectKeyChanges(ctx context.Context, fromOffset, toOffset int64) (userIDs []string, latestOffset int64, err error) SelectKeyChanges(ctx context.Context, fromOffset, toOffset int64) (userIDs []string, latestOffset int64, err error)
Prepare() error
} }
type StaleDeviceLists interface { type StaleDeviceLists interface {