Skip to content

Commit 2d2dea9

Browse files
committed
clean unnecessary function
Signed-off-by: Loic Marchal <lmarchal@redhat.com>
1 parent d73b099 commit 2d2dea9

2 files changed

Lines changed: 13 additions & 19 deletions

File tree

pkg/epp/flowcontrol/controller/controller.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,13 @@ func (fc *FlowController) EnqueueAndWait(
216216
flowKey := req.FlowKey()
217217
priority := strconv.Itoa(flowKey.Priority)
218218
reqBytes := req.ByteSize()
219-
sloClass := extractHeader(req, metadata.ObjectiveKey)
219+
sloClass := metrics.SLOClassNone
220+
if r := req.InferenceRequest(); r != nil {
221+
sloClass = fwkrequest.GetHeader(r.Headers, metadata.ObjectiveKey)
222+
if sloClass == "" {
223+
sloClass = metrics.SLOClassNone
224+
}
225+
}
220226
if sloClass == "" {
221227
sloClass = metrics.SLOClassNone
222228
}
@@ -342,13 +348,6 @@ func (fc *FlowController) withConnectionWithFallback(
342348
return fn(conn, fallback)
343349
})
344350
}
345-
func extractHeader(req flowcontrol.FlowControlRequest, name string) string {
346-
infReq := req.InferenceRequest()
347-
if infReq == nil || infReq.Headers == nil {
348-
return ""
349-
}
350-
return fwkrequest.GetHeader(infReq.Headers, name)
351-
}
352351

353352
// tryDistribution handles a single attempt to select a shard and submit a request.
354353
// It uses the provided `conn` to access the registry data plane.

pkg/epp/flowcontrol/controller/internal/item.go

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,12 @@ func (fi *FlowItem) finalizeInternal(outcome types.QueueOutcome, err error) {
168168
fi.OriginalRequest().ModelName(), fi.OriginalRequest().TargetModelName(),
169169
duration)
170170

171-
sloClass := extractHeader(fi.originalRequest, metadata.ObjectiveKey)
172-
if sloClass == "" {
173-
sloClass = metrics.SLOClassNone
171+
sloClass := metrics.SLOClassNone
172+
if req := fi.originalRequest.InferenceRequest(); req != nil {
173+
sloClass = request.GetHeader(req.Headers, metadata.ObjectiveKey)
174+
if sloClass == "" {
175+
sloClass = metrics.SLOClassNone
176+
}
174177
}
175178
metrics.RecordFlowControlSLORequestQueueDuration(
176179
sloClass, outcomeStr, fi.originalRequest.InferencePoolName(),
@@ -180,14 +183,6 @@ func (fi *FlowItem) finalizeInternal(outcome types.QueueOutcome, err error) {
180183
close(fi.done)
181184
}
182185

183-
func extractHeader(req flowcontrol.FlowControlRequest, name string) string {
184-
infReq := req.InferenceRequest()
185-
if infReq == nil || infReq.Headers == nil {
186-
return ""
187-
}
188-
return request.GetHeader(infReq.Headers, name)
189-
}
190-
191186
// inferOutcome determines the correct QueueOutcome and Error based on the cause of finalization and whether the item
192187
// was already admitted to a queue.
193188
func inferOutcome(cause error, isQueued bool) (types.QueueOutcome, error) {

0 commit comments

Comments
 (0)