@@ -956,7 +956,8 @@ func (vs *vstream) getJournalEvent(ctx context.Context, sgtid *binlogdatapb.Shar
956
956
mode = matchAll
957
957
je .participants [inner ] = false
958
958
case matchNone :
959
- return nil , fmt .Errorf ("not all journaling participants are in the stream: journal: %v, stream: %v" , journal .Participants , vs .vgtid .ShardGtids )
959
+ return nil , vterrors .Errorf (vtrpcpb .Code_FAILED_PRECONDITION , "not all journaling participants are in the stream: journal: %v, stream: %v" ,
960
+ journal .Participants , vs .vgtid .ShardGtids )
960
961
}
961
962
continue nextParticipant
962
963
}
@@ -965,7 +966,8 @@ func (vs *vstream) getJournalEvent(ctx context.Context, sgtid *binlogdatapb.Shar
965
966
case undecided , matchNone :
966
967
mode = matchNone
967
968
case matchAll :
968
- return nil , fmt .Errorf ("not all journaling participants are in the stream: journal: %v, stream: %v" , journal .Participants , vs .vgtid .ShardGtids )
969
+ return nil , vterrors .Errorf (vtrpcpb .Code_FAILED_PRECONDITION , "not all journaling participants are in the stream: journal: %v, stream: %v" ,
970
+ journal .Participants , vs .vgtid .ShardGtids )
969
971
}
970
972
}
971
973
if mode == matchNone {
@@ -1037,7 +1039,8 @@ func (vs *vstream) keyspaceHasBeenResharded(ctx context.Context, keyspace string
1037
1039
for _ , s := range ksShardGTIDs {
1038
1040
shard := shards [s .GetShard ()]
1039
1041
if shard == nil {
1040
- return false , vterrors .Errorf (vtrpcpb .Code_FAILED_PRECONDITION , "shard provided in VGTID, %s, not found in the %s keyspace" , s .GetShard (), keyspace )
1042
+ return false , vterrors .Errorf (vtrpcpb .Code_FAILED_PRECONDITION , "shard provided in VGTID, %s, not found in the %s keyspace" ,
1043
+ s .GetShard (), keyspace )
1041
1044
}
1042
1045
if ! shard .GetIsPrimaryServing () {
1043
1046
reshardPossible = true
0 commit comments