Skip to content

Commit

Permalink
Don't use ephemeral code for journal event participants
Browse files Browse the repository at this point in the history
Don't retry if topo server can't resolve in the vtgate

Signed-off-by: Matt Lord <[email protected]>
  • Loading branch information
mattlord committed Jan 31, 2025
1 parent d878c2d commit be74e0c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions go/vt/vtgate/vstream_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func (vsm *vstreamManager) VStream(ctx context.Context, tabletType topodatapb.Ta
}
if ts == nil {
log.Errorf("unable to get topo server in VStream()")
return vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "unable to get topoology server")
return vterrors.Errorf(vtrpcpb.Code_INTERNAL, "unable to get topoology server")
}
vs := &vstream{
vgtid: vgtid,
Expand Down Expand Up @@ -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_INTERNAL, "not all journaling participants are in the stream: journal: %v, stream: %v",
journal.Participants, vs.vgtid.ShardGtids)
}
continue nextParticipant
Expand All @@ -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_INTERNAL, "not all journaling participants are in the stream: journal: %v, stream: %v",
journal.Participants, vs.vgtid.ShardGtids)
}
}
Expand Down

0 comments on commit be74e0c

Please sign in to comment.