diff --git a/internal/proxy/multi_rate_limiter.go b/internal/proxy/multi_rate_limiter.go index f62750fd76567b4c8ea2012e6076f84004bf5c27..4d7ba71cd70035d5122dc911c6b117bd69d974ba 100644 --- a/internal/proxy/multi_rate_limiter.go +++ b/internal/proxy/multi_rate_limiter.go @@ -203,7 +203,7 @@ func (rl *rateLimiter) setRates(collectionRate *proxypb.CollectionRate) error { } else { return fmt.Errorf("unregister rateLimiter for rateType %s", r.GetRt().String()) } - log.RatedInfo(30, "current collection rates in proxy", + log.RatedDebug(30, "current collection rates in proxy", zap.String("rateType", r.Rt.String()), zap.String("rateLimit", ratelimitutil.Limit(r.GetR()).String()), ) @@ -314,7 +314,7 @@ func (rl *rateLimiter) registerLimiters(globalLevel bool) { limit := ratelimitutil.Limit(r) burst := r // use rate as burst, because Limiter is with punishment mechanism, burst is insignificant. rl.limiters.GetOrInsert(internalpb.RateType(rt), ratelimitutil.NewLimiter(limit, burst)) - log.Info("RateLimiter register for rateType", + log.RatedDebug(30, "RateLimiter register for rateType", zap.String("rateType", internalpb.RateType_name[rt]), zap.String("rate", ratelimitutil.Limit(r).String()), zap.String("burst", fmt.Sprintf("%v", burst))) diff --git a/internal/rootcoord/quota_center.go b/internal/rootcoord/quota_center.go index cb88d503b8c15877c49ccf24ce5a0a022d6b235e..4dcc44345f23e990401e5c0236e0d28910d054b3 100644 --- a/internal/rootcoord/quota_center.go +++ b/internal/rootcoord/quota_center.go @@ -285,7 +285,7 @@ func (q *QuotaCenter) forceDenyWriting(errorCode commonpb.ErrorCode, collections q.currentRates[collection][internalpb.RateType_DMLBulkLoad] = 0 q.quotaStates[collection][milvuspb.QuotaState_DenyToWrite] = errorCode } - log.Warn("QuotaCenter force to deny writing", + log.RatedWarn(10, "QuotaCenter force to deny writing", zap.Int64s("collectionIDs", collections), zap.String("reason", errorCode.String())) } @@ -334,6 +334,7 @@ func (q *QuotaCenter) guaranteeMinRate(minRate float64, rateType internalpb.Rate // calculateReadRates calculates and sets dql rates. func (q *QuotaCenter) calculateReadRates() { + log := log.Ctx(context.Background()).WithRateGroup("rootcoord.QuotaCenter", 1.0, 60.0) if Params.QuotaConfig.ForceDenyReading { q.forceDenyReading(commonpb.ErrorCode_ForceDeny) return @@ -393,13 +394,13 @@ func (q *QuotaCenter) calculateReadRates() { for _, collection := range collections { if q.currentRates[collection][internalpb.RateType_DQLSearch] != Inf && realTimeSearchRate > 0 { q.currentRates[collection][internalpb.RateType_DQLSearch] = Limit(realTimeSearchRate * coolOffSpeed) - log.Warn("QuotaCenter cool read rates off done", + log.RatedWarn(10, "QuotaCenter cool read rates off done", zap.Int64("collectionID", collection), zap.Any("searchRate", q.currentRates[collection][internalpb.RateType_DQLSearch])) } if q.currentRates[collection][internalpb.RateType_DQLQuery] != Inf && realTimeQueryRate > 0 { q.currentRates[collection][internalpb.RateType_DQLQuery] = Limit(realTimeQueryRate * coolOffSpeed) - log.Warn("QuotaCenter cool read rates off done", + log.RatedWarn(10, "QuotaCenter cool read rates off done", zap.Int64("collectionID", collection), zap.Any("queryRate", q.currentRates[collection][internalpb.RateType_DQLQuery])) } @@ -407,8 +408,6 @@ func (q *QuotaCenter) calculateReadRates() { q.guaranteeMinRate(Params.QuotaConfig.DQLMinSearchRatePerCollection, internalpb.RateType_DQLSearch, collections...) q.guaranteeMinRate(Params.QuotaConfig.DQLMinQueryRatePerCollection, internalpb.RateType_DQLQuery, collections...) - log.Info("QueryNodeMetrics when cool-off", - zap.Any("metrics", q.queryNodeMetrics)) } // TODO: unify search and query? @@ -419,7 +418,6 @@ func (q *QuotaCenter) calculateReadRates() { // calculateWriteRates calculates and sets dml rates. func (q *QuotaCenter) calculateWriteRates() error { - log := log.Ctx(context.Background()).WithRateGroup("rootcoord.QuotaCenter", 1.0, 60.0) if Params.QuotaConfig.ForceDenyWriting { q.forceDenyWriting(commonpb.ErrorCode_ForceDeny) return nil @@ -468,9 +466,6 @@ func (q *QuotaCenter) calculateWriteRates() error { } q.guaranteeMinRate(Params.QuotaConfig.DMLMinInsertRatePerCollection, internalpb.RateType_DMLInsert) q.guaranteeMinRate(Params.QuotaConfig.DMLMinDeleteRatePerCollection, internalpb.RateType_DMLDelete) - log.RatedDebug(10, "QuotaCenter cool write rates off done", - zap.Int64("collectionID", collection), - zap.Float64("factor", factor)) } return nil @@ -738,7 +733,7 @@ func (q *QuotaCenter) checkDiskQuota() { colDiskQuota := Params.QuotaConfig.DiskQuotaPerCollection for collection, binlogSize := range q.dataCoordMetrics.CollectionBinlogSize { if float64(binlogSize) >= colDiskQuota { - log.Warn("collection disk quota exceeded", + log.RatedWarn(10, "collection disk quota exceeded", zap.Int64("collection", collection), zap.Int64("coll disk usage", binlogSize), zap.Float64("coll disk quota", colDiskQuota)) @@ -750,7 +745,7 @@ func (q *QuotaCenter) checkDiskQuota() { } total := q.dataCoordMetrics.TotalBinlogSize if float64(total) >= totalDiskQuota { - log.Warn("total disk quota exceeded", + log.RatedWarn(10, "total disk quota exceeded", zap.Int64("total disk usage", total), zap.Float64("total disk quota", totalDiskQuota)) q.forceDenyWriting(commonpb.ErrorCode_DiskQuotaExhausted)