From 487c70f8142ecf06f19808958bcc23a01d26d4eb Mon Sep 17 00:00:00 2001
From: dongzezhao <dongzezhao@baidu.com>
Date: Tue, 22 Nov 2022 10:33:38 +0800
Subject: [PATCH 1/2] Fix: update node labels failed

---
 pkg/model/cluster_resource.go  | 2 +-
 pkg/storage/cache_node.go      | 2 +-
 pkg/storage/cache_node_test.go | 1 +
 pkg/storage/cache_pod.go       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/model/cluster_resource.go b/pkg/model/cluster_resource.go
index ef4bc2a3a..43d5663ec 100644
--- a/pkg/model/cluster_resource.go
+++ b/pkg/model/cluster_resource.go
@@ -47,7 +47,7 @@ type NodeInfo struct {
 	Status       string            `gorm:"column:status" json:"nodeStatus"`
 	CapacityJSON string            `gorm:"column:capacity" json:"-"`
 	Capacity     map[string]string `gorm:"-" json:"nodeCapacity"`
-	LabelsJSON   string            `gorm:"labels" json:"-"`
+	LabelsJSON   string            `gorm:"column:labels" json:"-"`
 	Labels       map[string]string `gorm:"-" json:"nodeLabels"`
 }
 
diff --git a/pkg/storage/cache_node.go b/pkg/storage/cache_node.go
index e3c9c5a49..9df5851a7 100644
--- a/pkg/storage/cache_node.go
+++ b/pkg/storage/cache_node.go
@@ -130,7 +130,7 @@ func (nc *ClusterNodeCache) UpdateNode(nodeID string, nodeInfo *model.NodeInfo)
 	log.Debugf("begin to update node. node id:%s", nodeID)
 
 	return WithTransaction(nc.dbCache, func(tx *gorm.DB) error {
-		err := tx.Model(&model.NodeInfo{}).Where("id = ?", nodeID).Updates(nodeInfo).Error
+		err := tx.Model(nodeInfo).Where("id = ?", nodeID).Updates(nodeInfo).Error
 		if err != nil {
 			log.Errorf("update node failed. node id:%s, error:%s", nodeID, err)
 			return err
diff --git a/pkg/storage/cache_node_test.go b/pkg/storage/cache_node_test.go
index a1464c995..826b3c50c 100644
--- a/pkg/storage/cache_node_test.go
+++ b/pkg/storage/cache_node_test.go
@@ -149,6 +149,7 @@ func TestNodeCache(t *testing.T) {
 		assert.Equal(t, nil, err)
 
 		updatedNode := &model.NodeInfo{
+			ID:     mockNodeID,
 			Status: "NotReady",
 			Labels: map[string]string{
 				"xxx/queue-name": "test-queue",
diff --git a/pkg/storage/cache_pod.go b/pkg/storage/cache_pod.go
index 4b69d1ed6..7baed63e2 100644
--- a/pkg/storage/cache_pod.go
+++ b/pkg/storage/cache_pod.go
@@ -100,7 +100,7 @@ func (cpc *ClusterPodCache) DeletePod(podID string) error {
 func (cpc *ClusterPodCache) UpdatePod(podID string, podInfo *model.PodInfo) error {
 	log.Debugf("begin to update pod. pod id:%s", podID)
 	return WithTransaction(cpc.dbCache, func(tx *gorm.DB) error {
-		err := tx.Model(&model.PodInfo{}).Where("id = ?", podID).Updates(podInfo).Error
+		err := tx.Model(podInfo).Where("id = ?", podID).Updates(podInfo).Error
 		if err != nil {
 			log.Errorf("update pod failed. pod id:%s, error:%s", podID, err)
 			return err

From 77bb231a5f897e4cf217fe9f5c070e834f66628b Mon Sep 17 00:00:00 2001
From: dongzezhao <dongzezhao@baidu.com>
Date: Tue, 22 Nov 2022 10:49:50 +0800
Subject: [PATCH 2/2] fix resource filter

---
 pkg/job/runtime_v2/client/kube_runtime_client.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/job/runtime_v2/client/kube_runtime_client.go b/pkg/job/runtime_v2/client/kube_runtime_client.go
index 30d5bfa3f..f2aabb99d 100644
--- a/pkg/job/runtime_v2/client/kube_runtime_client.go
+++ b/pkg/job/runtime_v2/client/kube_runtime_client.go
@@ -315,7 +315,7 @@ func NewNodeHandler(q workqueue.RateLimitingInterface, cluster string) *NodeHand
 	}
 	resourceFilters := strings.TrimSpace(os.Getenv(pfschema.EnvPFResourceFilter))
 	if len(resourceFilters) > 0 {
-		filters := strings.Split(nodeLabels, ",")
+		filters := strings.Split(resourceFilters, ",")
 		rFilter = append(rFilter, filters...)
 	}
 	return &NodeHandler{