From 411e372ae4f8e00273c6d74333ce035a2dd13d1c Mon Sep 17 00:00:00 2001
From: shepherd cheung <1220798123@qq.com>
Date: Thu, 26 Sep 2024 17:31:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=20Modification=E3=80=91reset-cm=E5=86=99=E5=85=A5?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6bug=E4=BF=AE=E6=94=B9=20=E3=80=90=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=BA=20Modifier=E3=80=91Atlas=5Fzxp=20=E3=80=90?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1=E4=BA=BA=20Reviewer=E3=80=91luxiang6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/device/ascendtolerance.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkg/device/ascendtolerance.go b/pkg/device/ascendtolerance.go
index a506b584..bb8e93e3 100644
--- a/pkg/device/ascendtolerance.go
+++ b/pkg/device/ascendtolerance.go
@@ -199,6 +199,7 @@ func (hrt *HotResetTools) handlePodEvent(obj interface{}) {
 	case kubeclient.EventTypeDelete:
 		hrt.handlePodDeleteEvent(obj)
 	default:
+		hrt.queue.Forget(obj)
 		hwlog.RunLog.Debugf("hotReset scene not watch %s event(%s)", obj.(kubeclient.Event).Resource,
 			obj.(kubeclient.Event).Type)
 	}
@@ -238,7 +239,10 @@ func (hrt *HotResetTools) handlePodAddEvent(obj interface{}) {
 	err = hrt.writeCMToFile(cm)
 	if err != nil {
 		hwlog.RunLog.Errorf("Failed to write cm(%s) to file, err: %v", cm.Name, err)
+		hrt.queue.AddRateLimited(obj)
+		return
 	}
+	hrt.queue.Forget(obj)
 }
 
 func (hrt *HotResetTools) handlePodDeleteEvent(obj interface{}) {
@@ -269,6 +273,7 @@ func (hrt *HotResetTools) handlePodDeleteEvent(obj interface{}) {
 		hwlog.RunLog.Errorf("Failed to remove file: %v", rmErr)
 	}
 	delete(hrt.jobs, event.Key)
+	hrt.queue.Forget(obj)
 }
 
 func (hrt *HotResetTools) getPodFromCache(podKey string) (*v1.Pod, error) {
@@ -325,6 +330,7 @@ func (hrt *HotResetTools) handleConfigMapEvent(obj interface{}) {
 	case kubeclient.EventTypeDelete:
 		hrt.handleCMDeleteEvent(obj)
 	default:
+		hrt.queue.Forget(obj)
 		hwlog.RunLog.Debugf("hotReset scene not watch %s event(%s)", obj.(kubeclient.Event).Resource,
 			obj.(kubeclient.Event).Type)
 	}
@@ -353,6 +359,8 @@ func (hrt *HotResetTools) handleCMUpdateEvent(obj interface{}) {
 
 	if err = hrt.writeCMToFile(cm); err != nil {
 		hwlog.RunLog.Errorf("Failed to write cm(%s) to file, err: %v", cm.Name, err)
+		hrt.queue.AddRateLimited(obj)
+		return
 	}
 	hrt.queue.Forget(obj)
 }
-- 
Gitee


From 2b63a79d94ba38ba07e80c7276be1d60badfe193 Mon Sep 17 00:00:00 2001
From: shepherd cheung <1220798123@qq.com>
Date: Thu, 26 Sep 2024 19:23:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=20Modification=E3=80=91reset-cm=E5=86=99=E5=85=A5?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6bug=E4=BF=AE=E6=94=B9=20=E3=80=90=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=BA=20Modifier=E3=80=91Atlas=5Fzxp=20=E3=80=90?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1=E4=BA=BA=20Reviewer=E3=80=91luxiang6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/device/ascendtolerance.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/device/ascendtolerance.go b/pkg/device/ascendtolerance.go
index bb8e93e3..12189425 100644
--- a/pkg/device/ascendtolerance.go
+++ b/pkg/device/ascendtolerance.go
@@ -368,7 +368,7 @@ func (hrt *HotResetTools) handleCMUpdateEvent(obj interface{}) {
 func (hrt *HotResetTools) handleCMDeleteEvent(obj interface{}) {
 	event, ok := obj.(kubeclient.Event)
 	if !ok {
-		hwlog.RunLog.Errorf("get kubeclient event failed")
+		hwlog.RunLog.Errorf("get kube-client event failed")
 		return
 	}
 	hwlog.RunLog.Debugf("handle cm(%s) delete event", event.Key)
-- 
Gitee