Skip to content

Commit c16b095

Browse files
DSFans2014DSFans2014
committed
fix: use pointer
Signed-off-by: james <open4pd@4paradigm.com>
1 parent 909892c commit c16b095

8 files changed

Lines changed: 24 additions & 25 deletions

File tree

‎internal/pkg/api/device/ascend/device.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (dev *Devices) CommonWord() string {
7575
return dev.config.CommonWord
7676
}
7777

78-
func (dev *Devices) GetNodeDevices(n corev1.Node) ([]*device.DeviceInfo, error) {
78+
func (dev *Devices) GetNodeDevices(n *corev1.Node) ([]*device.DeviceInfo, error) {
7979
anno, ok := n.Annotations[dev.nodeRegisterAnno]
8080
if !ok {
8181
return []*device.DeviceInfo{}, fmt.Errorf("annos not found %s", dev.nodeRegisterAnno)
@@ -95,7 +95,7 @@ func (dev *Devices) GetNodeDevices(n corev1.Node) ([]*device.DeviceInfo, error)
9595
return nodeDevices, nil
9696
}
9797

98-
func (dev *Devices) GetResource(n corev1.Node) map[string]int {
98+
func (dev *Devices) GetResource(n *corev1.Node) map[string]int {
9999
resourceName := device.GetResourceName(dev.config.ResourceMemoryName)
100100
resourceMap := map[string]int{
101101
resourceName: 0,
@@ -121,7 +121,7 @@ func (dev *Devices) GetResource(n corev1.Node) map[string]int {
121121
return resourceMap
122122
}
123123

124-
func (dev *Devices) RunManager(n corev1.Node) {
124+
func (dev *Devices) RunManager(n *corev1.Node) {
125125
lmock := mock.NewMockLister(device.GetVendorName(dev.config.ResourceMemoryName))
126126
go device.Register(n, lmock, dev)
127127
mockmanager := dpm.NewManager(lmock)

‎internal/pkg/api/device/ascend/device_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func TestGetResource(t *testing.T) {
179179
},
180180
}
181181

182-
result := dev.GetResource(node)
182+
result := dev.GetResource(&node)
183183
resourceName := "Ascend310P-memory"
184184

185185
actualMemory := result[resourceName]

‎internal/pkg/api/device/device.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030

3131
"github.com/ccoveille/go-safecast"
3232
corev1 "k8s.io/api/core/v1"
33-
"k8s.io/apimachinery/pkg/api/resource"
3433
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3534
"k8s.io/klog/v2"
3635
)
@@ -73,9 +72,9 @@ type DevicePairScore struct {
7372

7473
type Devices interface {
7574
CommonWord() string
76-
GetNodeDevices(n corev1.Node) ([]*DeviceInfo, error)
77-
GetResource(n corev1.Node) map[string]int
78-
RunManager(n corev1.Node)
75+
GetNodeDevices(n *corev1.Node) ([]*DeviceInfo, error)
76+
GetResource(n *corev1.Node) map[string]int
77+
RunManager(n *corev1.Node)
7978
}
8079

8180
type ResourceNames struct {
@@ -111,15 +110,15 @@ func RunManagers() error {
111110
for name, dev := range DevicesMap {
112111
klog.Infof("%s run manager", name)
113112
ch[name] = make(chan int)
114-
go dev.RunManager(*node)
113+
go dev.RunManager(node)
115114
}
116115
for _, val := range ch {
117116
<-val
118117
}
119118
return nil
120119
}
121120

122-
func Register(n corev1.Node, l *mock.MockLister, dev Devices) {
121+
func Register(n *corev1.Node, l *mock.MockLister, dev Devices) {
123122
for {
124123
resourceMap := dev.GetResource(n)
125124
l.SetResource(resourceMap)
@@ -236,10 +235,10 @@ func DecodePairScores(pairScores string) (*DevicePairScores, error) {
236235
return devicePairScores, nil
237236
}
238237

239-
func CheckHealthy(n corev1.Node, cardResourceName string) bool {
240-
cards, ok := n.Status.Capacity.Name(corev1.ResourceName(cardResourceName), resource.DecimalSI).AsInt64()
241-
if !ok || cards == 0 {
238+
func CheckHealthy(n *corev1.Node, cardResourceName string) bool {
239+
capacity, exists := n.Status.Capacity[corev1.ResourceName(cardResourceName)]
240+
if !exists {
242241
return false
243242
}
244-
return true
243+
return !capacity.IsZero()
245244
}

‎internal/pkg/api/device/hygon/device.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (dev *DCUDevices) CommonWord() string {
6262
return HygonDCUCommonWord
6363
}
6464

65-
func (dev *DCUDevices) GetNodeDevices(n corev1.Node) ([]*device.DeviceInfo, error) {
65+
func (dev *DCUDevices) GetNodeDevices(n *corev1.Node) ([]*device.DeviceInfo, error) {
6666
devEncoded, ok := n.Annotations[RegisterAnnos]
6767
if !ok {
6868
return []*device.DeviceInfo{}, errors.New("annos not found " + RegisterAnnos)
@@ -84,7 +84,7 @@ func (dev *DCUDevices) GetNodeDevices(n corev1.Node) ([]*device.DeviceInfo, erro
8484
return nodedevices, nil
8585
}
8686

87-
func (dev *DCUDevices) GetResource(n corev1.Node) map[string]int {
87+
func (dev *DCUDevices) GetResource(n *corev1.Node) map[string]int {
8888
memoryResourceName := device.GetResourceName(HygonResourceMemory)
8989
resourceMap := map[string]int{
9090
memoryResourceName: 0,
@@ -110,7 +110,7 @@ func (dev *DCUDevices) GetResource(n corev1.Node) map[string]int {
110110
return resourceMap
111111
}
112112

113-
func (dev *DCUDevices) RunManager(n corev1.Node) {
113+
func (dev *DCUDevices) RunManager(n *corev1.Node) {
114114
lmock := mock.NewMockLister(device.GetVendorName(HygonResourceMemory))
115115
device.Register(n, lmock, dev)
116116
mockmanager := dpm.NewManager(lmock)

‎internal/pkg/api/device/hygon/device_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func TestDCUDevices_GetResource(t *testing.T) {
5151
},
5252
}
5353

54-
result := dev.GetResource(node)
54+
result := dev.GetResource(&node)
5555
resourceName := device.GetResourceName(config.ResourceMemoryName)
5656

5757
expectedTotalMemory := 65520 * 6

‎internal/pkg/api/device/kunlun/device.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (dev *KunlunVDevices) CommonWord() string {
6060
return XPUDevice
6161
}
6262

63-
func (dev *KunlunVDevices) GetNodeDevices(n corev1.Node) ([]*device.DeviceInfo, error) {
63+
func (dev *KunlunVDevices) GetNodeDevices(n *corev1.Node) ([]*device.DeviceInfo, error) {
6464
anno, ok := n.Annotations[RegisterAnnos]
6565
if !ok {
6666
return []*device.DeviceInfo{}, fmt.Errorf("annos not found %s", RegisterAnnos)
@@ -80,7 +80,7 @@ func (dev *KunlunVDevices) GetNodeDevices(n corev1.Node) ([]*device.DeviceInfo,
8080
return nodeDevices, nil
8181
}
8282

83-
func (dev *KunlunVDevices) GetResource(n corev1.Node) map[string]int {
83+
func (dev *KunlunVDevices) GetResource(n *corev1.Node) map[string]int {
8484
memoryResourceName := device.GetResourceName(KunlunResourceVMemory)
8585
vCountResourceName := device.GetResourceName(KunlunResourceVCount)
8686
resourceMap := map[string]int{
@@ -100,7 +100,7 @@ func (dev *KunlunVDevices) GetResource(n corev1.Node) map[string]int {
100100
return resourceMap
101101
}
102102

103-
func (dev *KunlunVDevices) RunManager(n corev1.Node) {
103+
func (dev *KunlunVDevices) RunManager(n *corev1.Node) {
104104
lmock := mock.NewMockLister(device.GetVendorName(KunlunResourceVCount))
105105
device.Register(n, lmock, dev)
106106
mockmanager := dpm.NewManager(lmock)

‎internal/pkg/api/device/nvidia/device.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func (dev *NvidiaGPUDevices) CommonWord() string {
9393
return NvidiaGPUDevice
9494
}
9595

96-
func (dev *NvidiaGPUDevices) GetNodeDevices(n corev1.Node) ([]*device.DeviceInfo, error) {
96+
func (dev *NvidiaGPUDevices) GetNodeDevices(n *corev1.Node) ([]*device.DeviceInfo, error) {
9797
devEncoded, ok := n.Annotations[RegisterAnnos]
9898
if !ok {
9999
return []*device.DeviceInfo{}, errors.New("annos not found " + RegisterAnnos)
@@ -161,7 +161,7 @@ func (dev *NvidiaGPUDevices) GetNodeDevices(n corev1.Node) ([]*device.DeviceInfo
161161
return nodedevices, nil
162162
}
163163

164-
func (dev *NvidiaGPUDevices) GetResource(n corev1.Node) map[string]int {
164+
func (dev *NvidiaGPUDevices) GetResource(n *corev1.Node) map[string]int {
165165
memoryResourceName := device.GetResourceName(dev.config.ResourceMemoryName)
166166
coreResourceName := device.GetResourceName(dev.config.ResourceCoreName)
167167
memoryPercentageName := device.GetResourceName(dev.config.ResourceMemoryPercentageName)
@@ -200,7 +200,7 @@ func (dev *NvidiaGPUDevices) GetResource(n corev1.Node) map[string]int {
200200
return resourceMap
201201
}
202202

203-
func (dev *NvidiaGPUDevices) RunManager(n corev1.Node) {
203+
func (dev *NvidiaGPUDevices) RunManager(n *corev1.Node) {
204204
lmock := mock.NewMockLister(Vendor)
205205
go device.Register(n, lmock, dev)
206206
mockmanager := dpm.NewManager(lmock)

‎internal/pkg/api/device/nvidia/device_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestGetResource(t *testing.T) {
6161
}
6262

6363
t.Run("Test Nvidia A100 device addition", func(t *testing.T) {
64-
result := dev.GetResource(node)
64+
result := dev.GetResource(&node)
6565

6666
expectedMemoryResource := "gpu-memory"
6767
expectedCoreResource := "gpu-core"

0 commit comments

Comments
 (0)