From d98f471646adfae02d2c5e7eb3f2852e5a1a9a3c Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Fri, 31 Jan 2025 11:29:28 -0500 Subject: [PATCH] Don't use ephemeral code for journal event participants Signed-off-by: Matt Lord --- go/vt/vtgate/vstream_manager.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/vt/vtgate/vstream_manager.go b/go/vt/vtgate/vstream_manager.go index 3a8e98f1c66..43f38d2755d 100644 --- a/go/vt/vtgate/vstream_manager.go +++ b/go/vt/vtgate/vstream_manager.go @@ -956,7 +956,7 @@ func (vs *vstream) getJournalEvent(ctx context.Context, sgtid *binlogdatapb.Shar mode = matchAll je.participants[inner] = false case matchNone: - return nil, vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "not all journaling participants are in the stream: journal: %v, stream: %v", + return nil, vterrors.Errorf(vtrpcpb.Code_ABORTED, "not all journaling participants are in the stream: journal: %v, stream: %v", journal.Participants, vs.vgtid.ShardGtids) } continue nextParticipant @@ -966,7 +966,7 @@ func (vs *vstream) getJournalEvent(ctx context.Context, sgtid *binlogdatapb.Shar case undecided, matchNone: mode = matchNone case matchAll: - return nil, vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "not all journaling participants are in the stream: journal: %v, stream: %v", + return nil, vterrors.Errorf(vtrpcpb.Code_ABORTED, "not all journaling participants are in the stream: journal: %v, stream: %v", journal.Participants, vs.vgtid.ShardGtids) } }