diff --git a/modules/mesh-recovery/cmd/mesh-recovery/dump.go b/modules/mesh-recovery/cmd/mesh-recovery/dump.go index 3fb2d9b83..457900181 100644 --- a/modules/mesh-recovery/cmd/mesh-recovery/dump.go +++ b/modules/mesh-recovery/cmd/mesh-recovery/dump.go @@ -21,7 +21,7 @@ const ( backupSeat = "node-backup" itemStarted = "item-started" itemEnded = "item-ended" - itemStartedSteam = "SEAT_node-backup_item-started" + itemStartedStream = "SEAT_node-backup_item-started" itemEndedStream = "SEAT_node-backup_item-ended" ) @@ -103,7 +103,7 @@ func (d *dumpView) runs(module string) string { // readNow reads the last start and end of each of the bus module's items once more, through an ordered consumer made for // that read (§556): the restore said its restore-started, acknowledged, before it reads (§563). func (d *dumpView) readNow(ctx context.Context, module string) error { - for _, c := range []struct{ stream, event string }{{itemStartedSteam, itemStarted}, {itemEndedStream, itemEnded}} { + for _, c := range []struct{ stream, event string }{{itemStartedStream, itemStarted}, {itemEndedStream, itemEnded}} { cons, err := d.js.OrderedConsumer(ctx, c.stream, jetstream.OrderedConsumerConfig{ FilterSubjects: []string{itemSubject(c.event, "*", keys.EscapeName(module), "*")}, DeliverPolicy: jetstream.DeliverLastPerSubjectPolicy}) diff --git a/modules/mesh-recovery/cmd/mesh-recovery/main.go b/modules/mesh-recovery/cmd/mesh-recovery/main.go index 3c50f938c..9e9a1a69e 100644 --- a/modules/mesh-recovery/cmd/mesh-recovery/main.go +++ b/modules/mesh-recovery/cmd/mesh-recovery/main.go @@ -128,7 +128,7 @@ func run(ctx context.Context, getenv func(string) string, logOut io.Writer) erro return err } dump := newDumpView(js, func() (string, error) { return seatlist.HolderOf(conn.Call, meshbroker.Seat) }) - for _, s := range []string{itemStartedSteam, itemEndedStream} { + for _, s := range []string{itemStartedStream, itemEndedStream} { if _, err := account.HearSeatEvents(ctx, js, s, dump.hear, logger.Printf); err != nil { return err } diff --git a/modules/mesh-recovery/cmd/mesh-recovery/whole_integration_test.go b/modules/mesh-recovery/cmd/mesh-recovery/whole_integration_test.go index 5cbaf0e31..5811d048a 100644 --- a/modules/mesh-recovery/cmd/mesh-recovery/whole_integration_test.go +++ b/modules/mesh-recovery/cmd/mesh-recovery/whole_integration_test.go @@ -91,7 +91,7 @@ func TestRecoveryWhole(t *testing.T) { } for stream, subject := range map[string]string{ nodeengine.StreamRunning: "mesh.seat.node-engine.event.running.>", - itemStartedSteam: "mesh.seat.node-backup.event.item-started.>", + itemStartedStream: "mesh.seat.node-backup.event.item-started.>", itemEndedStream: "mesh.seat.node-backup.event.item-ended.>", meshbroker.StreamSnapshotRestored: "mesh.seat.mesh-broker.event.snapshot-restored.>", } {