Skip to content

Commit adcb9a4

Browse files
fix: log context deadline exceeded specifically in access validation
Adds explicit logging when access validation probes fail due to context deadline exceeded, distinguishing timeouts from auth denials or other transient errors. Signed-off-by: Wen Liang <liangwen12year@gmail.com>
1 parent 1b1d4da commit adcb9a4

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

maas-api/internal/models/discovery.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,11 @@ func (m *Manager) fetchModelsWithRetry(ctx context.Context, authHeader string, s
228228
lastResult = authRes
229229
return lastResult != authRetry, nil
230230
}); err != nil {
231-
m.logger.Debug("Access validation failed: model fetch backoff exhausted", "service", meta.ServiceName, "endpoint", meta.Endpoint, "error", err)
231+
if ctx.Err() == context.DeadlineExceeded {
232+
m.logger.Debug("Access validation failed: context deadline exceeded", "service", meta.ServiceName, "endpoint", meta.Endpoint, "timeout", accessCheckTimeout)
233+
} else {
234+
m.logger.Debug("Access validation failed: model fetch backoff exhausted", "service", meta.ServiceName, "endpoint", meta.Endpoint, "error", err)
235+
}
232236
return nil // explicit fail-closed on error
233237
}
234238

@@ -255,6 +259,10 @@ func (m *Manager) fetchModels(ctx context.Context, authHeader string, subscripti
255259
// #nosec G704 -- Intentional HTTP request to probe model endpoint for authorization check
256260
resp, err := m.httpClient.Do(req)
257261
if err != nil {
262+
if ctx.Err() == context.DeadlineExceeded {
263+
m.logger.Debug("Access validation: request timed out (context deadline exceeded)", "service", meta.ServiceName, "endpoint", meta.Endpoint)
264+
return nil, authDenied // fail-closed, no point retrying a deadline
265+
}
258266
m.logger.Debug("Access validation: GET request failed", "service", meta.ServiceName, "endpoint", meta.Endpoint, "error", err)
259267
return nil, authRetry
260268
}

0 commit comments

Comments
 (0)