Skip to content

fix: server recorder prints unnecessary error logs #7262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SongZhen0704 merged 1 commit into from
Jul 5, 2024
Merged

fix: server recorder prints unnecessary error logs #7262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions server/controller/recorder/updater/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,15 @@ func (p *Pod) generateDBItemToAdd(cloudItem *cloudmodel.Pod) (*mysql.Pod, bool)
)))
return nil, false
}
podServiceID, exists := p.cache.ToolDataSet.GetPodServiceIDByLcuuid(cloudItem.PodServiceLcuuid)
if !exists {
log.Error(p.metadata.Logf(resourceAForResourceBNotFound(
ctrlrcommon.RESOURCE_TYPE_POD_SERVICE_EN, cloudItem.PodServiceLcuuid,
ctrlrcommon.RESOURCE_TYPE_POD_EN, cloudItem.Lcuuid,
)))
var podServiceID int
if cloudItem.PodServiceLcuuid != "" {
podServiceID, exists = p.cache.ToolDataSet.GetPodServiceIDByLcuuid(cloudItem.PodServiceLcuuid)
if !exists {
log.Error(p.metadata.Logf(resourceAForResourceBNotFound(
ctrlrcommon.RESOURCE_TYPE_POD_SERVICE_EN, cloudItem.PodServiceLcuuid,
ctrlrcommon.RESOURCE_TYPE_POD_EN, cloudItem.Lcuuid,
)))
}
}
var podReplicaSetID int
if cloudItem.PodReplicaSetLcuuid != "" {
Expand Down Expand Up @@ -202,12 +205,17 @@ func (p *Pod) generateUpdateInfo(diffBase *diffbase.Pod, cloudItem *cloudmodel.P
structInfo.PodGroupLcuuid.Set(diffBase.PodGroupLcuuid, cloudItem.PodGroupLcuuid)
}
if diffBase.PodServiceLcuuid != cloudItem.PodServiceLcuuid {
podServiceID, exists := p.cache.ToolDataSet.GetPodServiceIDByLcuuid(cloudItem.PodServiceLcuuid)
if !exists {
log.Error(p.metadata.Logf(resourceAForResourceBNotFound(
ctrlrcommon.RESOURCE_TYPE_POD_SERVICE_EN, cloudItem.PodServiceLcuuid,
ctrlrcommon.RESOURCE_TYPE_POD_EN, cloudItem.Lcuuid,
)))
var podServiceID int
if cloudItem.PodServiceLcuuid != "" {
var exists bool
podServiceID, exists = p.cache.ToolDataSet.GetPodServiceIDByLcuuid(cloudItem.PodServiceLcuuid)
if !exists {
log.Error(p.metadata.Logf(resourceAForResourceBNotFound(
ctrlrcommon.RESOURCE_TYPE_POD_SERVICE_EN, cloudItem.PodServiceLcuuid,
ctrlrcommon.RESOURCE_TYPE_POD_EN, cloudItem.Lcuuid,
)))
return nil, nil, false
}
}
mapInfo["pod_service_id"] = podServiceID
structInfo.PodServiceID.SetNew(podServiceID)
Expand Down