Skip to content

Commit 656fdeb

Browse files
committed
Count the number of rate-limited samples in distributor_samples_in_total
Signed-off-by: Xiaochao Dong (@damnever) <[email protected]>
1 parent 86af904 commit 656fdeb

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

pkg/distributor/distributor.go

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -583,21 +583,9 @@ func (d *Distributor) Push(ctx context.Context, req *cortexpb.WriteRequest) (*co
583583
inflight := d.inflightPushRequests.Inc()
584584
defer d.inflightPushRequests.Dec()
585585

586-
if d.cfg.InstanceLimits.MaxInflightPushRequests > 0 && inflight > int64(d.cfg.InstanceLimits.MaxInflightPushRequests) {
587-
return nil, errTooManyInflightPushRequests
588-
}
589-
590-
if d.cfg.InstanceLimits.MaxIngestionRate > 0 {
591-
if rate := d.ingestionRate.Rate(); rate >= d.cfg.InstanceLimits.MaxIngestionRate {
592-
return nil, errMaxSamplesPushRateLimitReached
593-
}
594-
}
595-
596586
now := time.Now()
597587
d.activeUsers.UpdateUserTimestamp(userID, now)
598588

599-
removeReplica := false
600-
601589
numSamples := 0
602590
numExemplars := 0
603591
for _, ts := range req.Timeseries {
@@ -610,6 +598,17 @@ func (d *Distributor) Push(ctx context.Context, req *cortexpb.WriteRequest) (*co
610598
// Count the total number of metadata in.
611599
d.incomingMetadata.WithLabelValues(userID).Add(float64(len(req.Metadata)))
612600

601+
if d.cfg.InstanceLimits.MaxInflightPushRequests > 0 && inflight > int64(d.cfg.InstanceLimits.MaxInflightPushRequests) {
602+
return nil, errTooManyInflightPushRequests
603+
}
604+
605+
if d.cfg.InstanceLimits.MaxIngestionRate > 0 {
606+
if rate := d.ingestionRate.Rate(); rate >= d.cfg.InstanceLimits.MaxIngestionRate {
607+
return nil, errMaxSamplesPushRateLimitReached
608+
}
609+
}
610+
611+
removeReplica := false
613612
// Cache user limit with overrides so we spend less CPU doing locking. See issue #4904
614613
limits := d.limits.GetOverridesForUser(userID)
615614

0 commit comments

Comments
 (0)