Skip to content

Commit a6aa443

Browse files
committed
fix: append all pod endpoints from profile results
Signed-off-by: kyanokashi <kyanokashi2@gmail.com>
1 parent 40949c3 commit a6aa443

File tree

2 files changed

+16
-19
lines changed

2 files changed

+16
-19
lines changed

pkg/plugins/scorer/active_request.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -176,25 +176,24 @@ func (s *ActiveRequest) PreRequest(
176176
) {
177177
debugLogger := log.FromContext(ctx).V(logutil.DEBUG)
178178

179-
targetProfiles := []string{schedulingResult.PrimaryProfileName}
180-
if schedulingResult.PrimaryProfileName != "prefill" {
181-
targetProfiles = append(targetProfiles, "prefill")
182-
}
183-
184-
podNames := make([]string, 0, len(targetProfiles))
185-
for _, profileName := range targetProfiles {
186-
profileResult := schedulingResult.ProfileResults[profileName]
179+
podNames := make([]string, 0, len(schedulingResult.ProfileResults))
180+
for profileName, profileResult := range schedulingResult.ProfileResults {
187181
if profileResult == nil || len(profileResult.TargetPods) == 0 {
188182
continue
189183
}
190184

191185
podName := profileResult.TargetPods[0].GetPod().NamespacedName.String()
192186
podNames = append(podNames, podName)
193187
s.incrementPodCount(podName)
194-
debugLogger.Info("Added request to cache", "requestId", request.RequestId, "podName", podName)
188+
debugLogger.Info(
189+
"Added request to cache",
190+
"requestId", request.RequestId,
191+
"podName", podName,
192+
"profileName", profileName,
193+
)
195194
}
196195

197-
// add to request cache with TTL
196+
// add to request cache
198197
s.requestCache.Set(request.RequestId, &requestEntry{PodNames: podNames, RequestID: request.RequestId}, 0) // Use default TTL
199198
}
200199

pkg/plugins/scorer/active_request_test.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@ func newTestRequest(id string) *types.LLMRequest {
3232
}
3333
}
3434

35-
func newTestSchedulingResult(primaryProfile string, profilePods map[string]types.Pod) *types.SchedulingResult {
35+
func newTestSchedulingResult(profilePods map[string]types.Pod) *types.SchedulingResult {
3636
profileResults := make(map[string]*types.ProfileRunResult)
3737
for profile, pod := range profilePods {
3838
profileResults[profile] = &types.ProfileRunResult{
3939
TargetPods: []types.Pod{pod},
4040
}
4141
}
4242
return &types.SchedulingResult{
43-
ProfileResults: profileResults,
44-
PrimaryProfileName: primaryProfile,
43+
ProfileResults: profileResults,
4544
}
4645
}
4746

@@ -140,7 +139,7 @@ func TestActiveRequestScorer_PreRequest(t *testing.T) {
140139

141140
t.Run("First request", func(t *testing.T) {
142141
request := newTestRequest("test-request-1")
143-
schedulingResult := newTestSchedulingResult(testProfile, map[string]types.Pod{
142+
schedulingResult := newTestSchedulingResult(map[string]types.Pod{
144143
testProfile: podA,
145144
})
146145

@@ -152,7 +151,7 @@ func TestActiveRequestScorer_PreRequest(t *testing.T) {
152151

153152
t.Run("Second request to multiple pods", func(t *testing.T) {
154153
request := newTestRequest("test-request-2")
155-
schedulingResult := newTestSchedulingResult(testProfile, map[string]types.Pod{
154+
schedulingResult := newTestSchedulingResult(map[string]types.Pod{
156155
testProfile: podA,
157156
"prefill": podB,
158157
})
@@ -171,11 +170,10 @@ func TestActiveRequestScorer_ResponseComplete(t *testing.T) {
171170

172171
podA := newTestPod("pod-a", 2)
173172
request := newTestRequest("test-request-1")
174-
testProfile := "test-profile"
175173

176174
// Setup initial state: add request through PreRequest
177-
schedulingResult := newTestSchedulingResult(testProfile, map[string]types.Pod{
178-
testProfile: podA,
175+
schedulingResult := newTestSchedulingResult(map[string]types.Pod{
176+
"test-profile": podA,
179177
})
180178
scorer.PreRequest(ctx, request, schedulingResult)
181179

@@ -196,7 +194,7 @@ func TestActiveRequestScorer_TTLExpiration(t *testing.T) {
196194

197195
podA := newTestPod("pod-a", 0)
198196
request := newTestRequest("test-request-ttl")
199-
schedulingResult := newTestSchedulingResult("test-profile", map[string]types.Pod{
197+
schedulingResult := newTestSchedulingResult(map[string]types.Pod{
200198
"test-profile": podA,
201199
})
202200

0 commit comments

Comments
 (0)