test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-11-30 02:48:45 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Add Rated group for checkpoint gc skip case (#21949)

Browse Source 
Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2023-02-03 14:23:56 +08:00 committed by GitHub
parent dfa2dac8fb
commit 787ce7c121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/datacoord/garbage_collector.go
View File

@ -234,12 +234,13 @@ func (gc *garbageCollector) clearEtcd() {
}
for _, segment := range drops {
log := log.With(zap.Int64("segmentID", segment.ID))
if !gc.isExpire(segment.GetDroppedAt()) {
continue
}
// segment gc shall only happen when channel cp is after segment dml cp.
if segment.GetDmlPosition().GetTimestamp() > channelCPs[segment.GetInsertChannel()] {
log.RatedInfo(60, "dropped segment dml position after channel cp, skip meta gc",
log.WithRateGroup("GC_FAIL_CP_BEFORE", 1, 60).RatedInfo(60, "dropped segment dml position after channel cp, skip meta gc",
zap.Uint64("dmlPosTs", segment.GetDmlPosition().GetTimestamp()),
zap.Uint64("channelCpTs", channelCPs[segment.GetInsertChannel()]),
)

6
internal/log/global.go
View File

@ -102,8 +102,10 @@ func RatedWarn(cost float64, msg string, fields ...zap.Field) bool {
// With creates a child logger and adds structured context to it.
// Fields added to the child don't affect the parent, and vice versa.
func With(fields ...zap.Field) *zap.Logger {
return L().With(fields...).WithOptions(zap.AddCallerSkip(-1))
func With(fields ...zap.Field) *MLogger {
return &MLogger{
Logger: L().With(fields...).WithOptions(zap.AddCallerSkip(-1)),
}
}
// SetLevel alters the logging level.

8
internal/querynode/shard_cluster.go
View File

@ -202,10 +202,12 @@ func (sc *ShardCluster) Close() {
})
}
func (sc *ShardCluster) getLogger() *zap.Logger {
return log.With(zap.Int64("collectionID", sc.collectionID),
func (sc *ShardCluster) getLogger() *log.MLogger {
return log.With(
zap.Int64("collectionID", sc.collectionID),
zap.String("channel", sc.vchannelName),
zap.Int64("replicaID", sc.replicaID))
zap.Int64("replicaID", sc.replicaID),
)
}
// serviceable returns whether shard cluster could provide query service.