Skip to content

fix: resolve index out of range panic in fetchContainerInfo for Ascend devices #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cygnushan wants to merge 1 commit into
base: main
Choose a base branch
from
+183 −5
Open

fix: resolve index out of range panic in fetchContainerInfo for Ascend devices #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions server/internal/data/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,20 @@ func (r *podRepo) fetchContainerInfo(pod *corev1.Pod) []*biz.Container {
if err != nil {
return containers
}
bizContainerDevices := []biz.ContainerDevices{}
// Merge devices from all device types per container index.
// pdevices: map[deviceType]PodSingleDevice([]ContainerDevices)
numContainers := len(pod.Spec.Containers)
bizContainerDevices := make([]biz.ContainerDevices, numContainers)
for _, pds := range pdevices {
copier.Copy(&bizContainerDevices, pds)
var bizPds biz.PodSingleDevice
copier.Copy(&bizPds, pds)
for i, cd := range bizPds {
if i < numContainers {
bizContainerDevices[i] = append(bizContainerDevices[i], cd...)
}
}
}
if len(bizContainerDevices) < 1 {
if len(pdevices) == 0 {
return containers
}

Expand Down
9 changes: 8 additions & 1 deletion server/internal/provider/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,14 @@ func DecodePodDevices(pod *corev1.Pod, log *log.Helper) (PodDevices, error) {
pd[devType] = make(PodSingleDevice, 0)
switch devType {
case AscendGPUDevice, Ascend310PGPUDevice:
for _, s := range strings.Split(str, OnePodMultiContainerSplitSymbol) {
for i, s := range strings.Split(str, OnePodMultiContainerSplitSymbol) {
if i >= len(pod.Spec.Containers) {
break
}
if s == "" {
pd[devType] = append(pd[devType], ContainerDevices{})
continue
}
cd, err := DecodeNpuContainerDevices(s)
if err != nil {
return PodDevices{}, nil
Expand Down
164 changes: 163 additions & 1 deletion server/internal/provider/util/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,13 @@ limitations under the License.
package util

import (
"github.com/go-kratos/kratos/v2/log"
"os"
"reflect"
"testing"

"github.com/go-kratos/kratos/v2/log"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

var inRequestDevices map[string]string
Expand Down Expand Up @@ -345,3 +350,160 @@ func Test_DecodePodDevices(t *testing.T) {
})
}
}

func Test_DecodePodDevices_Ascend(t *testing.T) {
// Ensure Ascend device keys are registered in SupportDevices.
SupportDevices["Ascend"] = "hami.io/Ascend910B-devices-allocated"
SupportDevices["Ascend310P"] = "hami.io/Ascend310P-devices-allocated"

logger := log.NewHelper(log.NewStdLogger(os.Stdout))

tests := []struct {
name string
pod *corev1.Pod
want PodDevices
wantErr bool
wantErrMsg string
}{
{
name: "Ascend310P single container single device",
pod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"hami.io/Ascend310P-devices-allocated": "E0766E64-20C0AB59-CC9AB1A4-3778030A-83003019,Ascend310P,6144,100:",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{{Name: "main"}},
},
},
want: PodDevices{
"Ascend310P": {
{
{Idx: 0, UUID: "E0766E64-20C0AB59-CC9AB1A4-3778030A-83003019", Type: "Ascend310P", Usedmem: 6144, Usedcores: 25},
},
},
},
wantErr: false,
},
{
name: "Ascend310P two containers",
pod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"hami.io/Ascend310P-devices-allocated": "E0766E64-20C0AB59-CC9AB1A4-3778030A-83003019,Ascend310P,6144,100:;D7E96E64-214123F1-E8E618E4-AED8030A-E3003039,Ascend310P,6144,100:",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{Name: "ctr1"},
{Name: "ctr2"},
},
},
},
want: PodDevices{
"Ascend310P": {
{
{Idx: 0, UUID: "E0766E64-20C0AB59-CC9AB1A4-3778030A-83003019", Type: "Ascend310P", Usedmem: 6144, Usedcores: 25},
},
{
{Idx: 0, UUID: "D7E96E64-214123F1-E8E618E4-AED8030A-E3003039", Type: "Ascend310P", Usedmem: 6144, Usedcores: 25},
},
},
},
wantErr: false,
},
{
name: "Ascend310P annotation segments exceed container count - should truncate",
pod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
// Two device segments but only one container in spec.
"hami.io/Ascend310P-devices-allocated": "E0766E64-20C0AB59-CC9AB1A4-3778030A-83003019,Ascend310P,6144,100:;D7E96E64-214123F1-E8E618E4-AED8030A-E3003039,Ascend310P,6144,100:",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{{Name: "main"}},
},
},
want: PodDevices{
"Ascend310P": {
{
{Idx: 0, UUID: "E0766E64-20C0AB59-CC9AB1A4-3778030A-83003019", Type: "Ascend310P", Usedmem: 6144, Usedcores: 25},
},
},
},
wantErr: false,
},
{
name: "Ascend310P empty segment in middle should produce empty ContainerDevices placeholder",
pod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"hami.io/Ascend310P-devices-allocated": "E0766E64-20C0AB59-CC9AB1A4-3778030A-83003019,Ascend310P,6144,100:;;D7E96E64-214123F1-E8E618E4-AED8030A-E3003039,Ascend310P,6144,100:",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{Name: "ctr1"},
{Name: "ctr2"},
{Name: "ctr3"},
},
},
},
want: PodDevices{
"Ascend310P": {
{
{Idx: 0, UUID: "E0766E64-20C0AB59-CC9AB1A4-3778030A-83003019", Type: "Ascend310P", Usedmem: 6144, Usedcores: 25},
},
{}, // empty segment placeholder
{
{Idx: 0, UUID: "D7E96E64-214123F1-E8E618E4-AED8030A-E3003039", Type: "Ascend310P", Usedmem: 6144, Usedcores: 25},
},
},
},
wantErr: false,
},
{
name: "Ascend310P malformed device should return error",
pod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"hami.io/Ascend310P-devices-allocated": "bad-format-string",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{{Name: "main"}},
},
},
want: PodDevices{},
wantErr: true,
},
{
name: "empty annotations should return empty PodDevices",
pod: &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{{Name: "main"}},
},
},
want: PodDevices{},
wantErr: false,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := DecodePodDevices(tt.pod, logger)
if (err != nil) != tt.wantErr {
t.Errorf("DecodePodDevices() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("DecodePodDevices() = %+v, want %+v", got, tt.want)
}
})
}
}