mirror of https://github.com/milvus-io/milvus.git
Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>pull/22007/head
parent
8de99eaf70
commit
5c5c755643
|
@ -238,12 +238,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()]),
|
||||
)
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue