From e90493d359d29d8e65a2fdd7c7a2b17b764e402a Mon Sep 17 00:00:00 2001 From: shepherd cheung <1220798123@qq.com> Date: Sat, 25 May 2024 10:43:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E9=97=AE=E9=A2=98=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=20Defect=E3=80=91reset-cm=E4=BF=A1=E6=81=AF=E4=BB=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=86=99=E5=85=A5=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AF=B4=E6=98=8E=20Modification=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0vendor=20=E3=80=90=E4=BF=AE=E6=94=B9=E4=BA=BA=20Modifi?= =?UTF-8?q?er=E3=80=91Atlas=5Fzxp=20=E3=80=90=E8=AF=84=E5=AE=A1=E4=BA=BA?= =?UTF-8?q?=20Reviewer=E3=80=91Atlas=5Fkfa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/device/ascendtolerance.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/device/ascendtolerance.go b/pkg/device/ascendtolerance.go index 9534744e..eb520c4b 100644 --- a/pkg/device/ascendtolerance.go +++ b/pkg/device/ascendtolerance.go @@ -189,7 +189,7 @@ func (hrt *HotResetTools) handleEvent(obj interface{}) { func (hrt *HotResetTools) handlePodEvent(obj interface{}) { switch obj.(kubeclient.Event).Type { - case kubeclient.EventTypeAdd, kubeclient.EventTypeUpdate: + case kubeclient.EventTypeAdd: hrt.handlePodAddEvent(obj) case kubeclient.EventTypeDelete: hrt.handlePodDeleteEvent(obj) @@ -205,6 +205,7 @@ func (hrt *HotResetTools) handlePodAddEvent(obj interface{}) { pod, err := hrt.getPodFromCache(event.Key) if err != nil { hwlog.RunLog.Error(err) + hrt.queue.AddRateLimited(obj) return } jobName := common.GetJobNameOfPod(pod) -- Gitee From 9e458e202fe91ab069f2fa1b0268116bb3729980 Mon Sep 17 00:00:00 2001 From: shepherd cheung <1220798123@qq.com> Date: Sat, 25 May 2024 10:44:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E9=97=AE=E9=A2=98=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=20Defect=E3=80=91reset-cm=E4=BF=A1=E6=81=AF=E4=BB=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=86=99=E5=85=A5=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AF=B4=E6=98=8E=20Modification=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0vendor=20=E3=80=90=E4=BF=AE=E6=94=B9=E4=BA=BA=20Modifi?= =?UTF-8?q?er=E3=80=91Atlas=5Fzxp=20=E3=80=90=E8=AF=84=E5=AE=A1=E4=BA=BA?= =?UTF-8?q?=20Reviewer=E3=80=91Atlas=5Fkfa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/device/ascendtolerance.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/device/ascendtolerance.go b/pkg/device/ascendtolerance.go index eb520c4b..a2a6d3f4 100644 --- a/pkg/device/ascendtolerance.go +++ b/pkg/device/ascendtolerance.go @@ -149,6 +149,8 @@ func (hrt *HotResetTools) SyncResetCM(client *kubeclient.ClientK8s) { hrt.podIndexer = client.PodInformer.GetIndexer() hrt.cmIndexer = cmInformer.GetIndexer() + cache.WaitForCacheSync(wait.NeverStop, cmInformer.HasSynced, client.PodInformer.HasSynced) + go hrt.run() } -- Gitee From 1ffd5fcfbae1477d4fce9b01036eff4a2c49a311 Mon Sep 17 00:00:00 2001 From: shepherd cheung <1220798123@qq.com> Date: Sat, 25 May 2024 11:11:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E9=97=AE=E9=A2=98=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=20Defect=E3=80=91reset-cm=E4=BF=A1=E6=81=AF=E4=BB=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=86=99=E5=85=A5=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AF=B4=E6=98=8E=20Modification=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0vendor=20=E3=80=90=E4=BF=AE=E6=94=B9=E4=BA=BA=20Modifi?= =?UTF-8?q?er=E3=80=91Atlas=5Fzxp=20=E3=80=90=E8=AF=84=E5=AE=A1=E4=BA=BA?= =?UTF-8?q?=20Reviewer=E3=80=91Atlas=5Fkfa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/kubeclient/kubeclient.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/kubeclient/kubeclient.go b/pkg/kubeclient/kubeclient.go index aed33e96..65b6b411 100644 --- a/pkg/kubeclient/kubeclient.go +++ b/pkg/kubeclient/kubeclient.go @@ -291,6 +291,12 @@ func checkNodeName(nodeName string) error { func (ki *ClientK8s) ResourceEventHandler(res ResourceType, filter func(obj interface{}) bool) cache. ResourceEventHandler { enqueue := func(obj interface{}, event EventType) { + if res == CMResource && event == EventTypeAdd { + return + } + if res == PodResource && event == EventTypeUpdate { + return + } key, err := cache.MetaNamespaceKeyFunc(obj) if err != nil { hwlog.RunLog.Warnf("get key from obj failed, %v", err) -- Gitee From 7de9f677db34e9e4da493b615dd846a9d0454308 Mon Sep 17 00:00:00 2001 From: shepherd cheung <1220798123@qq.com> Date: Sat, 25 May 2024 11:35:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E9=97=AE=E9=A2=98=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=20Defect=E3=80=91reset-cm=E4=BF=A1=E6=81=AF=E4=BB=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=86=99=E5=85=A5=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AF=B4=E6=98=8E=20Modification=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0vendor=20=E3=80=90=E4=BF=AE=E6=94=B9=E4=BA=BA=20Modifi?= =?UTF-8?q?er=E3=80=91Atlas=5Fzxp=20=E3=80=90=E8=AF=84=E5=AE=A1=E4=BA=BA?= =?UTF-8?q?=20Reviewer=E3=80=91Atlas=5Fkfa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/device/ascendtolerance.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/device/ascendtolerance.go b/pkg/device/ascendtolerance.go index a2a6d3f4..8f0d7018 100644 --- a/pkg/device/ascendtolerance.go +++ b/pkg/device/ascendtolerance.go @@ -203,7 +203,7 @@ func (hrt *HotResetTools) handlePodEvent(obj interface{}) { func (hrt *HotResetTools) handlePodAddEvent(obj interface{}) { event := obj.(kubeclient.Event) - hwlog.RunLog.Errorf("handle pod(%s) %s event", event.Key, event.Type) + hwlog.RunLog.Infof("handle pod(%s) %s event", event.Key, event.Type) pod, err := hrt.getPodFromCache(event.Key) if err != nil { hwlog.RunLog.Error(err) @@ -219,7 +219,7 @@ func (hrt *HotResetTools) handlePodAddEvent(obj interface{}) { hrt.jobs[event.Key] = jobName cm, err := hrt.GetCMFromCache(pod.GetNamespace() + "/" + common.ResetInfoCMNamePrefix + jobName) if err != nil { - hwlog.RunLog.Error(err) + hwlog.RunLog.Warn(err) hrt.queue.AddRateLimited(obj) return } -- Gitee From 4b5774782da6d6392e50beb4e93719a411b1ec42 Mon Sep 17 00:00:00 2001 From: shepherd cheung <1220798123@qq.com> Date: Sat, 25 May 2024 11:36:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E9=97=AE=E9=A2=98=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=20Defect=E3=80=91reset-cm=E4=BF=A1=E6=81=AF=E4=BB=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=86=99=E5=85=A5=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AF=B4=E6=98=8E=20Modification=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0vendor=20=E3=80=90=E4=BF=AE=E6=94=B9=E4=BA=BA=20Modifi?= =?UTF-8?q?er=E3=80=91Atlas=5Fzxp=20=E3=80=90=E8=AF=84=E5=AE=A1=E4=BA=BA?= =?UTF-8?q?=20Reviewer=E3=80=91Atlas=5Fkfa?= 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 8f0d7018..fed10220 100644 --- a/pkg/device/ascendtolerance.go +++ b/pkg/device/ascendtolerance.go @@ -206,7 +206,7 @@ func (hrt *HotResetTools) handlePodAddEvent(obj interface{}) { hwlog.RunLog.Infof("handle pod(%s) %s event", event.Key, event.Type) pod, err := hrt.getPodFromCache(event.Key) if err != nil { - hwlog.RunLog.Error(err) + hwlog.RunLog.Warn(err) hrt.queue.AddRateLimited(obj) return } -- Gitee