Skip to content

Commit e3e0f51

Browse files
committed
Introduce timeout for session sweeping
Signed-off-by: Daniel Garnier-Moiroux <git@garnier.wf>
1 parent 178fe21 commit e3e0f51

1 file changed

Lines changed: 19 additions & 16 deletions

File tree

‎mcp-core/src/main/java/io/modelcontextprotocol/server/transport/HttpServletStreamableServerTransportProvider.java‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ public class HttpServletStreamableServerTransportProvider extends HttpServlet
150150
*/
151151
private final Disposable sessionSweeper;
152152

153+
private static Duration SESSION_SWEEP_TIMEOUT = Duration.ofSeconds(30);
154+
153155
/**
154156
* Security validator for validating HTTP requests.
155157
*/
@@ -217,14 +219,13 @@ private HttpServletStreamableServerTransportProvider(McpJsonMapper jsonMapper, S
217219
* down
218220
*/
219221
private Disposable startSessionSweeper(Duration sessionSweepInterval) {
220-
return Flux.interval(sessionSweepInterval, sessionSweepInterval, Schedulers.boundedElastic())
222+
return Flux
223+
.interval(sessionSweepInterval, sessionSweepInterval,
224+
Schedulers.newSingle("streamable-http-server-transport-session-sweeper"))
221225
.concatMap(
222226
tick -> sweepSessions().doOnError(e -> logger.error("Session sweep failed", e)).onErrorComplete())
223-
.onErrorComplete(error -> {
224-
logger.error("Session sweeper error", error);
225-
return true;
226-
})
227-
.subscribe();
227+
.subscribe(next -> {
228+
}, error -> logger.error("Session sweeper error", error));
228229
}
229230

230231
/**
@@ -240,16 +241,18 @@ private Mono<Void> sweepSessions() {
240241
return Mono.empty();
241242
}
242243
Set<String> active = this.activeSessions.getAndSet(ConcurrentHashMap.newKeySet());
243-
return Flux.fromIterable(this.sessions.values())
244-
.filter(session -> !session.hasOpenStream() && !active.contains(session.getId()))
245-
.filter(session -> this.sessions.remove(session.getId(), session))
246-
.flatMap(session -> {
247-
logger.debug("Evicting idle session {}", session.getId());
248-
return session.closeGracefully()
249-
.doOnError(e -> logger.warn("Failed to close idle session {}: {}", session.getId(), e.getMessage()))
250-
.onErrorComplete();
251-
})
252-
.then();
244+
return Flux.fromIterable(this.sessions.values()).filter(session -> {
245+
if (session.hasOpenStream() || active.contains(session.getId())) {
246+
return false;
247+
}
248+
return this.sessions.remove(session.getId(), session);
249+
}).flatMap(session -> {
250+
logger.debug("Evicting idle session {}", session.getId());
251+
return session.closeGracefully()
252+
.timeout(SESSION_SWEEP_TIMEOUT)
253+
.doOnError(e -> logger.warn("Failed to close idle session {}: {}", session.getId(), e.getMessage()))
254+
.onErrorComplete();
255+
}).then();
253256
}
254257

255258
/**

0 commit comments

Comments
 (0)