Merge branch 'main' of github.com:matrix-org/dendrite into s7evink/eventsize

internal/sqlutil/migrate.go

@@ -112,7 +112,13 @@ func (m *Migrator) Up(ctx context.Context) error {
 
 func (m *Migrator) insertMigration(ctx context.Context, txn *sql.Tx, migrationName string) error {
 	if m.insertStmt == nil {
-		stmt, err := m.db.Prepare(insertVersionSQL)
+		var stmt *sql.Stmt
+		var err error
+		if txn == nil {
+			stmt, err = m.db.PrepareContext(ctx, insertVersionSQL)
+		} else {
+			stmt, err = txn.PrepareContext(ctx, insertVersionSQL)
+		}
 		if err != nil {
 			return fmt.Errorf("unable to prepare insert statement: %w", err)
 		}

setup/jetstream/nats.go

@@ -87,6 +87,7 @@ func (s *NATSInstance) Prepare(process *process.ProcessContext, cfg *config.JetS
 	return js, nc
 }
 
+// nolint:gocyclo
 func setupNATS(process *process.ProcessContext, cfg *config.JetStream, nc *natsclient.Conn) (natsclient.JetStreamContext, *natsclient.Conn) {
 	if nc == nil {
 		var err error
@@ -126,18 +127,34 @@ func setupNATS(process *process.ProcessContext, cfg *config.JetStream, nc *natsc
 			subjects = []string{name, name + ".>"}
 		}
 		if info != nil {
+			// If the stream config doesn't match what we expect, try to update
+			// it. If that doesn't work then try to blow it away and we'll then
+			// recreate it in the next section.
+			// Each specific option that we set must be checked by hand, as if
+			// you DeepEqual the whole config struct, it will always show that
+			// there's a difference because the NATS Server will return defaults
+			// in the stream info.
 			switch {
 			case !reflect.DeepEqual(info.Config.Subjects, subjects):
 				fallthrough
 			case info.Config.Retention != stream.Retention:
 				fallthrough
 			case info.Config.Storage != stream.Storage:
+				fallthrough
+			case info.Config.MaxAge != stream.MaxAge:
+				// Try updating the stream first, as many things can be updated
+				// non-destructively.
+				if info, err = s.UpdateStream(stream); err != nil {
+					logrus.WithError(err).Warnf("Unable to update stream %q, recreating...", name)
+					// We failed to update the stream, this is a last attempt to get
+					// things working but may result in data loss.
 					if err = s.DeleteStream(name); err != nil {
-					logrus.WithError(err).Fatal("Unable to delete stream")
+						logrus.WithError(err).Fatalf("Unable to delete stream %q", name)
 					}
 					info = nil
 				}
 			}
+		}
 		if info == nil {
 			// If we're trying to keep everything in memory (e.g. unit tests)
 			// then overwrite the storage policy.

setup/jetstream/streams.go

@@ -48,6 +48,7 @@ var streams = []*nats.StreamConfig{
 		Name:      InputRoomEvent,
 		Retention: nats.InterestPolicy,
 		Storage:   nats.FileStorage,
+		MaxAge:    time.Hour * 24,
 	},
 	{
 		Name:      InputDeviceListUpdate,