From f8833981d0b030ba9f43b00c6bf6474868a15497 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 17 Oct 2022 15:02:27 +0000 Subject: [PATCH] fix: Don't check for existing replicas when starting up This was blocking startup, creating a chicken and egg problem where if a replica died, a single one couldn't be bootstrapped again. --- enterprise/replicasync/replicasync.go | 8 -------- enterprise/replicasync/replicasync_test.go | 17 ----------------- 2 files changed, 25 deletions(-) diff --git a/enterprise/replicasync/replicasync.go b/enterprise/replicasync/replicasync.go index 0534c55246824..daac634efeb74 100644 --- a/enterprise/replicasync/replicasync.go +++ b/enterprise/replicasync/replicasync.go @@ -93,14 +93,6 @@ func New(ctx context.Context, logger slog.Logger, db database.Store, pubsub data if err != nil { return nil, xerrors.Errorf("run replica: %w", err) } - peers := manager.Regional() - if len(peers) > 0 { - self := manager.Self() - if self.RelayAddress == "" { - return nil, xerrors.Errorf("a relay address must be specified when running multiple replicas in the same region") - } - } - err = manager.subscribe(ctx) if err != nil { return nil, xerrors.Errorf("subscribe: %w", err) diff --git a/enterprise/replicasync/replicasync_test.go b/enterprise/replicasync/replicasync_test.go index b7709c1f6f814..7538b48a38920 100644 --- a/enterprise/replicasync/replicasync_test.go +++ b/enterprise/replicasync/replicasync_test.go @@ -44,23 +44,6 @@ func TestReplica(t *testing.T) { _ = server.Close() require.NoError(t, err) }) - t.Run("ErrorsWithoutRelayAddress", func(t *testing.T) { - // Ensures that the replica reports a successful status for - // accessing all of its peers. - t.Parallel() - db, pubsub := dbtestutil.NewDB(t) - _, err := db.InsertReplica(context.Background(), database.InsertReplicaParams{ - ID: uuid.New(), - CreatedAt: database.Now(), - StartedAt: database.Now(), - UpdatedAt: database.Now(), - Hostname: "something", - }) - require.NoError(t, err) - _, err = replicasync.New(context.Background(), slogtest.Make(t, nil), db, pubsub, nil) - require.Error(t, err) - require.Equal(t, "a relay address must be specified when running multiple replicas in the same region", err.Error()) - }) t.Run("ConnectsToPeerReplica", func(t *testing.T) { // Ensures that the replica reports a successful status for // accessing all of its peers.