Skip to content

Changed the remove method to work of a session instead of a clientID #915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hylkevds wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Changed the remove method to work of a session instead of a clientID #915

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33b7781
Changed the remove method to work of a session instead of a clientID
hylkevds Jul 27, 2025
1de0990
Handle session purging on the SessionLoop
hylkevds Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions broker/src/main/java/io/moquette/broker/SessionRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,18 @@ public SessionCreationResult(Session session, CreationModeEnum mode, boolean alr

private void removeExpiredSession(ISessionsRepository.SessionData expiredSession) {
final String expiredAt = expiredSession.expireAt().map(Instant::toString).orElse("UNDEFINED");
LOG.debug("Removing session {}, expired on {}", expiredSession.clientId(), expiredAt);
remove(expiredSession.clientId());
sessionsRepository.delete(expiredSession);

subscriptionsDirectory.removeSharedSubscriptionsForClient(expiredSession.clientId());
final String clientId = expiredSession.clientId();
loopsGroup.routeCommand(clientId, "PurgeSession", () -> {
LOG.debug("Removing session {}, expired on {}", clientId, expiredAt);
final Session session = pool.get(clientId);
boolean success = session.assignState(SessionStatus.DISCONNECTED, SessionStatus.DESTROYED);
if (!success) {
remove(session);
sessionsRepository.delete(expiredSession);
subscriptionsDirectory.removeSharedSubscriptionsForClient(clientId);
}
return null;
});
}

private void trackForRemovalOnExpiration(ISessionsRepository.SessionData session) {
Expand Down Expand Up @@ -501,20 +508,20 @@ private void purgeSessionState(Session session) {
throw new SessionCorruptedException("Session has already changed state: " + session);
}

unsubscribe(session);
remove(session.getClientID());

remove(session);
sessionsRepository.delete(session.getSessionData());
subscriptionsDirectory.removeSharedSubscriptionsForClient(session.getClientID());
}

void remove(String clientID) {
final Session old = pool.remove(clientID);
if (old != null) {
void remove(Session session) {
String clientID = session.getClientID();
if (pool.remove(clientID, session)) {
metricsProvider.removeOpenSession();
unsubscribe(session);
// remove from expired tracker if present
sessionExpirationService.untrack(clientID);
loopsGroup.routeCommand(clientID, "Clean up removed session", () -> {
old.cleanUp();
session.cleanUp();
return null;
});
}
Expand Down