mirror of https://github.com/milvus-io/milvus.git
Use replica memory size and cacheSize in getSystemInfoMetrics (#9579)
Signed-off-by: bigsheeper <yihao.dai@zilliz.com>pull/9624/head
parent
1bc4b36617
commit
8c510a52b2
|
@ -35,8 +35,8 @@ func getSystemInfoMetrics(ctx context.Context, req *milvuspb.GetMetricsRequest,
|
||||||
IP: node.session.Address,
|
IP: node.session.Address,
|
||||||
CPUCoreCount: metricsinfo.GetCPUCoreCount(false),
|
CPUCoreCount: metricsinfo.GetCPUCoreCount(false),
|
||||||
CPUCoreUsage: metricsinfo.GetCPUUsage(),
|
CPUCoreUsage: metricsinfo.GetCPUUsage(),
|
||||||
Memory: metricsinfo.GetMemoryCount(),
|
Memory: uint64(getUsedMemory(node.historical.replica, node.streaming.replica)),
|
||||||
MemoryUsage: metricsinfo.GetUsedMemoryCount(),
|
MemoryUsage: uint64(getTotalMemory()),
|
||||||
Disk: metricsinfo.GetDiskCount(),
|
Disk: metricsinfo.GetDiskCount(),
|
||||||
DiskUsage: metricsinfo.GetDiskUsage(),
|
DiskUsage: metricsinfo.GetDiskUsage(),
|
||||||
},
|
},
|
||||||
|
@ -80,11 +80,19 @@ func getSystemInfoMetrics(ctx context.Context, req *milvuspb.GetMetricsRequest,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkSegmentMemory(segmentLoadInfos []*querypb.SegmentLoadInfo, historicalReplica, streamingReplica ReplicaInterface) error {
|
func getUsedMemory(historicalReplica, streamingReplica ReplicaInterface) int64 {
|
||||||
historicalSegmentsMemSize := historicalReplica.getSegmentsMemSize()
|
historicalSegmentsMemSize := historicalReplica.getSegmentsMemSize()
|
||||||
streamingSegmentsMemSize := streamingReplica.getSegmentsMemSize()
|
streamingSegmentsMemSize := streamingReplica.getSegmentsMemSize()
|
||||||
usedRAMInMB := (historicalSegmentsMemSize + streamingSegmentsMemSize) / 1024.0 / 1024.0
|
return historicalSegmentsMemSize + streamingSegmentsMemSize
|
||||||
totalRAMInMB := Params.CacheSize * 1024.0
|
}
|
||||||
|
|
||||||
|
func getTotalMemory() int64 {
|
||||||
|
return Params.CacheSize * 1024 * 1024 * 1024
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkSegmentMemory(segmentLoadInfos []*querypb.SegmentLoadInfo, historicalReplica, streamingReplica ReplicaInterface) error {
|
||||||
|
usedRAMInMB := getUsedMemory(historicalReplica, streamingReplica) / 1024.0 / 1024.0
|
||||||
|
totalRAMInMB := getTotalMemory() / 1024.0 / 1024.0
|
||||||
|
|
||||||
segmentTotalSize := int64(0)
|
segmentTotalSize := int64(0)
|
||||||
for _, segInfo := range segmentLoadInfos {
|
for _, segInfo := range segmentLoadInfos {
|
||||||
|
|
Loading…
Reference in New Issue