[CONTROLLER/RECORDER] fixes cleaning pod bug

deepflowio · Jun 20, 2024 · 30df544 · 30df544
1 parent b15d959
commit 30df544
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/server/controller/recorder/cache/tool/data_set.go b/server/controller/recorder/cache/tool/data_set.go
@@ -2080,14 +2080,12 @@ func (t *DataSet) GetVMIDByPodNodeID(podNodeID int) (int, bool) {
 	}
 	log.Warningf("cache %s id (%s id: %d) not found", ctrlrcommon.RESOURCE_TYPE_VM_EN, ctrlrcommon.RESOURCE_TYPE_POD_NODE_EN, podNodeID)
 	var conn mysql.VMPodNodeConnection
-	result := mysql.Db.Where("pod_node_id = ?", podNodeID).Find(&conn)
+	result := mysql.Db.Where("pod_node_id = ?", podNodeID).Find(&conn) // TODO is nessary to query MySQL?
 	if result.RowsAffected == 1 {
 		t.AddVMPodNodeConnection(&conn)
 		return conn.VMID, true
-	} else {
-		log.Errorf("db %s (%s id: %d) not found", ctrlrcommon.RESOURCE_TYPE_VM_POD_NODE_CONNECTION_EN, ctrlrcommon.RESOURCE_TYPE_POD_NODE_EN, podNodeID)
-		return 0, false
 	}
+	return 0, false
 }
 
 func (t *DataSet) GetPodNodeIDByVMPodNodeConnectionLcuuid(lcuuid string) (int, bool) {

diff --git a/server/controller/recorder/cleaner.go b/server/controller/recorder/cleaner.go
@@ -275,7 +275,7 @@ func (c *Cleaner) cleanPodNodeDirty() {
 		}
 
 		var pods []mysql.Pod
-		mysql.Db.Where("pod_node_id NOT IN ?", podNodeIDs).Find(&pods)
+		mysql.Db.Where("pod_node_id != 0 AND pod_node_id NOT IN ?", podNodeIDs).Find(&pods)
 		if len(pods) != 0 {
 			mysql.Db.Delete(&pods)
 			logErrorDeleteResourceTypeABecauseResourceTypeBHasGone(ctrlrcommon.RESOURCE_TYPE_POD_EN, ctrlrcommon.RESOURCE_TYPE_POD_NODE_EN, pods)