github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 02:06:23 +00:00
Code Issues Projects Releases Wiki Activity

DRA: merge same request metadata across drivers

Browse Source 
When multiple driver metadata files contain the same request name, keep a
single request entry and merge devices into it. This avoids duplicate request
objects when count>1 allocations are split across drivers.

Assisted-by: Cursor (codex-5.3)
Signed-off-by: Or Shoval <oshoval@redhat.com>
This commit is contained in:
Or Shoval
2026-04-15 08:58:25 +03:00
committed by Alay Patel
parent 5cdb448736
commit b643483ccc
2 changed files with 91 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/dynamic-resource-allocation/devicemetadata/decode.go
View File

@@ -141,6 +141,7 @@ func readRequestDir(dir string) (*metadata.DeviceMetadata, error) {
}
var merged metadata.DeviceMetadata
mergedRequestIndex := map[string]int{}
for _, path := range matches {
dm, err := readMetadata(path)
if err != nil {
@@ -149,7 +150,14 @@ func readRequestDir(dir string) (*metadata.DeviceMetadata, error) {
if merged.PodClaimName == nil {
merged.PodClaimName = dm.PodClaimName
}
merged.Requests = append(merged.Requests, dm.Requests...)
for _, request := range dm.Requests {
if idx, ok := mergedRequestIndex[request.Name]; ok {
merged.Requests[idx].Devices = append(merged.Requests[idx].Devices, request.Devices...)
continue
}
mergedRequestIndex[request.Name] = len(merged.Requests)
merged.Requests = append(merged.Requests, request)
}
}
return &merged, nil
}

82
staging/src/k8s.io/dynamic-resource-allocation/devicemetadata/decode_test.go
View File

@@ -321,6 +321,14 @@ func TestReadRequestDir(t *testing.T) {
},
}},
}
gpuAltInternal := metadata.DeviceMetadataRequest{
Name: "gpu",
Devices: []metadata.Device{{
Driver: "mlx.example.com",
Pool: "worker-1",
Name: "gpu-1",
}},
}
nicInternal := metadata.DeviceMetadataRequest{
Name: "nic",
Devices: []metadata.Device{{
@@ -353,6 +361,59 @@ func TestReadRequestDir(t *testing.T) {
Devices: []v1alpha1.Device{{Driver: "nic.example.com", Pool: "worker-0", Name: "nic-0"}},
}},
})
primaryDriverJSON := mustMarshal(&v1alpha1.DeviceMetadata{
TypeMeta: metav1.TypeMeta{APIVersion: v1alpha1.SchemeGroupVersion.String(), Kind: "DeviceMetadata"},
ObjectMeta: metav1.ObjectMeta{Name: "my-claim", Namespace: "default", UID: "uid-1234", Generation: 1},
Requests: []v1alpha1.DeviceMetadataRequest{
{
Name: "gpu-0",
Devices: []v1alpha1.Device{{
Driver: "gpu.example.com",
Pool: "worker-0",
Name: "gpu-0",
Attributes: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
"model": {StringValue: ptr.To("LATEST-GPU-MODEL")}, //nolint:modernize
},
}},
},
{
Name: "single-gpu",
Devices: []v1alpha1.Device{{
Driver: "gpu.example.com",
Pool: "worker-0",
Name: "gpu-0",
Attributes: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
"model": {StringValue: ptr.To("LATEST-GPU-MODEL")}, //nolint:modernize
},
}},
},
{
Name: "gpu-1",
Devices: []v1alpha1.Device{{
Driver: "gpu.example.com",
Pool: "worker-0",
Name: "gpu-0",
Attributes: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
"model": {StringValue: ptr.To("LATEST-GPU-MODEL")}, //nolint:modernize
},
}},
},
},
})
secondaryDriverJSON := mustMarshal(&v1alpha1.DeviceMetadata{
TypeMeta: metav1.TypeMeta{APIVersion: v1alpha1.SchemeGroupVersion.String(), Kind: "DeviceMetadata"},
ObjectMeta: metav1.ObjectMeta{Name: "my-claim", Namespace: "default", UID: "uid-1234", Generation: 1},
Requests: []v1alpha1.DeviceMetadataRequest{
{
Name: "gpu-0",
Devices: []v1alpha1.Device{{Driver: "mlx.example.com", Pool: "worker-1", Name: "gpu-1"}},
},
{
Name: "gpu-1",
Devices: []v1alpha1.Device{{Driver: "mlx.example.com", Pool: "worker-1", Name: "gpu-1"}},
},
},
})
podClaimJSON := mustMarshal(&v1alpha1.DeviceMetadata{
TypeMeta: metav1.TypeMeta{APIVersion: v1alpha1.SchemeGroupVersion.String(), Kind: "DeviceMetadata"},
ObjectMeta: metav1.ObjectMeta{Name: "my-claim", Namespace: "default", UID: "uid-1234", Generation: 1},
@@ -377,6 +438,8 @@ func TestReadRequestDir(t *testing.T) {
singleDir := writeFile("single", "gpu.example.com"+metadata.MetadataFileSuffix, gpuJSON)
multiDir := writeFile("multi", "gpu.example.com"+metadata.MetadataFileSuffix, gpuJSON)
writeFile("multi", "nic.example.com"+metadata.MetadataFileSuffix, nicJSON)
sameRequestNameDir := writeFile("same-request-name", "gpu.example.com"+metadata.MetadataFileSuffix, primaryDriverJSON)
writeFile("same-request-name", "mlx.example.com"+metadata.MetadataFileSuffix, secondaryDriverJSON)
emptyDir := writeFile("empty", "unrelated.txt", []byte("not metadata"))
mixedDir := writeFile("mixed", "gpu.example.com"+metadata.MetadataFileSuffix, gpuJSON)
writeFile("mixed", "unrelated.json", []byte(`{"foo":"bar"}`))
@@ -399,6 +462,25 @@ func TestReadRequestDir(t *testing.T) {
Requests: []metadata.DeviceMetadataRequest{gpuInternal, nicInternal},
},
},
"merge-same-request-name-across-drivers": {
dir: sameRequestNameDir,
expected: &metadata.DeviceMetadata{
Requests: []metadata.DeviceMetadataRequest{
{
Name: "gpu-0",
Devices: append(gpuInternal.Devices, gpuAltInternal.Devices...),
},
{
Name: "single-gpu",
Devices: gpuInternal.Devices,
},
{
Name: "gpu-1",
Devices: append(gpuInternal.Devices, gpuAltInternal.Devices...),
},
},
},
},
"empty-directory": {
dir: emptyDir,
expectError: "no metadata files found",