Skip to content

Commit 61c0ebb

Browse files
committed
Each pod has independent loops to refresh metrics
1 parent 9079982 commit 61c0ebb

19 files changed

+528
-657
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ vet: ## Run go vet against code.
119119

120120
.PHONY: test
121121
test: manifests generate fmt vet envtest ## Run tests.
122-
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e) -coverprofile cover.out
122+
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e) -race -coverprofile cover.out
123123

124124
.PHONY: test-integration
125125
test-integration: manifests generate fmt vet envtest ## Run tests.

cmd/epp/main.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
"sigs.k8s.io/controller-runtime/pkg/manager"
3838
"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
3939
"sigs.k8s.io/gateway-api-inference-extension/internal/runnable"
40-
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend"
4140
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/vllm"
4241
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
4342
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics"
@@ -144,20 +143,16 @@ func run() error {
144143
ctx := ctrl.SetupSignalHandler()
145144

146145
// Setup runner.
147-
datastore := datastore.NewDatastore()
148-
provider := backend.NewProvider(&vllm.PodMetricsClientImpl{}, datastore)
146+
datastore := datastore.NewDatastore(ctx, &vllm.PodMetricsClientImpl{}, *refreshMetricsInterval, *refreshPrometheusMetricsInterval)
149147
serverRunner := &runserver.ExtProcServerRunner{
150148
GrpcPort: *grpcPort,
151149
DestinationEndpointHintMetadataNamespace: *destinationEndpointHintMetadataNamespace,
152150
DestinationEndpointHintKey: *destinationEndpointHintKey,
153151
PoolName: *poolName,
154152
PoolNamespace: *poolNamespace,
155-
RefreshMetricsInterval: *refreshMetricsInterval,
156-
RefreshPrometheusMetricsInterval: *refreshPrometheusMetricsInterval,
157153
Datastore: datastore,
158154
SecureServing: *secureServing,
159155
CertPath: *certPath,
160-
Provider: provider,
161156
UseStreaming: useStreamingServer,
162157
}
163158
if err := serverRunner.SetupWithManager(ctx, mgr); err != nil {

pkg/epp/backend/provider.go

-183
This file was deleted.

pkg/epp/backend/provider_test.go

-151
This file was deleted.

pkg/epp/controller/inferencemodel_reconciler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func TestInferenceModelReconciler(t *testing.T) {
190190
WithIndex(&v1alpha2.InferenceModel{}, datastore.ModelNameIndexKey, indexInferenceModelsByModelName).
191191
Build()
192192

193-
datastore := datastore.NewFakeDatastore(nil, test.modelsInStore, pool)
193+
datastore := datastore.NewFakeDatastore(t.Context(), &datastore.FakePodMetricsClient{}, nil, test.modelsInStore, pool)
194194
reconciler := &InferenceModelReconciler{
195195
Client: fakeClient,
196196
Record: record.NewFakeRecorder(10),

0 commit comments

Comments
 (0)