diff --git a/pkg/distributor/distributor_ingest_storage_test.go b/pkg/distributor/distributor_ingest_storage_test.go index 5c8a385384c..d7bcdc046ca 100644 --- a/pkg/distributor/distributor_ingest_storage_test.go +++ b/pkg/distributor/distributor_ingest_storage_test.go @@ -305,7 +305,7 @@ func TestDistributor_Push_ShouldReturnErrorMappedTo4xxStatusCodeIfWriteRequestCo // We expect a gRPC error. errStatus, ok := grpcutil.ErrorToStatus(err) require.True(t, ok) - assert.Equal(t, codes.FailedPrecondition, errStatus.Code()) + assert.Equal(t, codes.InvalidArgument, errStatus.Code()) assert.ErrorContains(t, errStatus.Err(), ingest.ErrWriteRequestDataItemTooLarge.Error()) // We expect the gRPC error to be detected as client error. diff --git a/pkg/distributor/errors.go b/pkg/distributor/errors.go index b5f6f9374b1..ae5689582af 100644 --- a/pkg/distributor/errors.go +++ b/pkg/distributor/errors.go @@ -274,9 +274,8 @@ func toGRPCStatusCode(errCause mimirpb.ErrorCause, serviceOverloadErrorEnabled b case mimirpb.INGESTION_RATE_LIMITED, mimirpb.REQUEST_RATE_LIMITED: if serviceOverloadErrorEnabled { return codes.Unavailable - } else { - return codes.ResourceExhausted } + return codes.ResourceExhausted case mimirpb.REPLICAS_DID_NOT_MATCH: return codes.AlreadyExists case mimirpb.TOO_MANY_CLUSTERS: