From c1401a1e8d57371d4064f0862538021648ba4d38 Mon Sep 17 00:00:00 2001 From: w30067828 Date: Tue, 3 Sep 2024 17:02:59 +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=91=E6=9B=B4=E6=96=B0annotation?= =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86=E6=B8=85=E9=99=A4=E5=AF=B9deviceKey?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E7=9A=84=E5=88=A4=E6=96=AD?= =?UTF-8?q?=20=E3=80=90=E4=BF=AE=E6=94=B9=E4=BA=BA=20Modifier=E3=80=91wang?= =?UTF-8?q?jun?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/server/manager.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/server/manager.go b/pkg/server/manager.go index 832ebedd..e8e16c26 100644 --- a/pkg/server/manager.go +++ b/pkg/server/manager.go @@ -853,10 +853,8 @@ func (hdm *HwDevManager) updateSpecTypePodAnnotation(deviceType, serverID string return err } for _, deviceInfo := range podDeviceInfo { - hwlog.RunLog.Debugf("pods: %s, %s, %s", deviceInfo.Pod.Name, deviceInfo.Pod.Status.Phase, deviceInfo.Pod.UID) - _, existDeviceKey := deviceInfo.Pod.Annotations[common.Pod910DeviceKey] _, existRealAlloc := deviceInfo.Pod.Annotations[common.ResourceNamePrefix+common.PodRealAlloc] - if existDeviceKey || existRealAlloc { + if existRealAlloc { continue } if len(deviceInfo.KltDevice) == 0 || len(deviceInfo.RealDevice) == 0 { -- Gitee From 4c3144f58adbe128ffd4894de670386be6c61b24 Mon Sep 17 00:00:00 2001 From: w30067828 Date: Tue, 3 Sep 2024 17:02:59 +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=91=E6=9B=B4=E6=96=B0annotation?= =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86=E6=B8=85=E9=99=A4=E5=AF=B9deviceKey?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E7=9A=84=E5=88=A4=E6=96=AD?= =?UTF-8?q?=20=E3=80=90=E4=BF=AE=E6=94=B9=E4=BA=BA=20Modifier=E3=80=91wang?= =?UTF-8?q?jun?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/server/manager.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/server/manager.go b/pkg/server/manager.go index 832ebedd..a8aa0de2 100644 --- a/pkg/server/manager.go +++ b/pkg/server/manager.go @@ -854,9 +854,8 @@ func (hdm *HwDevManager) updateSpecTypePodAnnotation(deviceType, serverID string } for _, deviceInfo := range podDeviceInfo { hwlog.RunLog.Debugf("pods: %s, %s, %s", deviceInfo.Pod.Name, deviceInfo.Pod.Status.Phase, deviceInfo.Pod.UID) - _, existDeviceKey := deviceInfo.Pod.Annotations[common.Pod910DeviceKey] _, existRealAlloc := deviceInfo.Pod.Annotations[common.ResourceNamePrefix+common.PodRealAlloc] - if existDeviceKey || existRealAlloc { + if existRealAlloc { continue } if len(deviceInfo.KltDevice) == 0 || len(deviceInfo.RealDevice) == 0 { -- Gitee