From bbdb3f358f3e4208816cb2fc818194c581cb80a2 Mon Sep 17 00:00:00 2001 From: adlerhurst <27845747+adlerhurst@users.noreply.github.com> Date: Mon, 19 May 2025 17:14:22 +0200 Subject: [PATCH] Revert "fix(mirror): ensure multiple runs (#9899)" This reverts commit bb56775435565ff5de18b8b38acfdc2a22d71f95. --- cmd/mirror/event_store.go | 5 ----- cmd/mirror/projections.go | 5 +---- internal/v2/readmodel/last_successful_mirror.go | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/cmd/mirror/event_store.go b/cmd/mirror/event_store.go index 4e0548ee2a..180b52543e 100644 --- a/cmd/mirror/event_store.go +++ b/cmd/mirror/event_store.go @@ -8,7 +8,6 @@ import ( "io" "time" - "github.com/jackc/pgx/v5/pgconn" "github.com/jackc/pgx/v5/stdlib" "github.com/shopspring/decimal" "github.com/spf13/cobra" @@ -173,10 +172,6 @@ func copyEvents(ctx context.Context, source, dest *db.DB, bulkSize uint32) { tag, err := conn.PgConn().CopyFrom(ctx, reader, "COPY eventstore.events2 FROM STDIN") eventCount = tag.RowsAffected() if err != nil { - pgErr := new(pgconn.PgError) - errors.As(err, &pgErr) - - logging.WithError(err).WithField("pg_err_details", pgErr.Detail).Error("unable to copy events into destination") return zerrors.ThrowUnknown(err, "MIGRA-DTHi7", "unable to copy events into destination") } diff --git a/cmd/mirror/projections.go b/cmd/mirror/projections.go index 6adbf01424..163bf55325 100644 --- a/cmd/mirror/projections.go +++ b/cmd/mirror/projections.go @@ -120,10 +120,7 @@ func projections( logging.OnError(err).Fatal("unable create static storage") config.Eventstore.Querier = old_es.NewCRDB(client) - newES := new_es.NewEventstore(client) - config.Eventstore.Pusher = newES - config.Eventstore.Searcher = newES - + config.Eventstore.Pusher = new_es.NewEventstore(client) es := eventstore.NewEventstore(config.Eventstore) esV4 := es_v4.NewEventstoreFromOne(es_v4_pg.New(client, &es_v4_pg.Config{ MaxRetries: config.Eventstore.MaxRetries, diff --git a/internal/v2/readmodel/last_successful_mirror.go b/internal/v2/readmodel/last_successful_mirror.go index ca7815b2a8..6635b73342 100644 --- a/internal/v2/readmodel/last_successful_mirror.go +++ b/internal/v2/readmodel/last_successful_mirror.go @@ -36,7 +36,6 @@ func (p *LastSuccessfulMirror) Filter() *eventstore.Filter { ), eventstore.FilterPagination( eventstore.Descending(), - eventstore.Limit(1), ), ) }