Skip to content

[Improvement-18699][API] Fix inverted session expiry check in createSessionIfAbsent #18703

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

Merged
SbloodyS merged 5 commits into from
Oct 23, 2026
Merged

[Improvement-18699][API] Fix inverted session expiry check in createSessionIfAbsent #18703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86a1226
[Fix-18699][API] Fix inverted session expiry check in createSessionIf…
kittimzhe Oct 14, 2026
6c01a06
Merge branch 'dev' into session-expiry-inversion-18699
SbloodyS Oct 14, 2026
ea05d54
Remove redundant comments per review
kittimzhe Oct 23, 2026
b708ffd
Merge branch 'dev' into session-expiry-inversion-18699
SbloodyS Oct 23, 2026
3a60896
Merge branch 'dev' into session-expiry-inversion-18699
SbloodyS Oct 23, 2026
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
2 changes: 1 addition & 1 deletion ...er-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public Session createSessionIfAbsent(User user) {
}
}
session = sessionList.get(0);
if (isSessionExpire(session)) {
if (!isSessionExpire(session)) {
session.setLastLoginTime(new Date());
sessionDao.updateById(session);
return session;
Expand Down
36 changes: 36 additions & 0 deletions ...heduler-api/src/test/java/org/apache/dolphinscheduler/api/service/SessionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,42 @@ public void testIsSessionExpireUsesConfiguredTimeout() {
Assertions.assertTrue(sessionService.isSessionExpire(expired));
}

@Test
public void testCreateSessionIfAbsentReusesUnexpiredSession() {
User user = new User();
user.setUserType(UserType.GENERAL_USER);
user.setId(1);
// fixture session's lastLoginTime is 40 days in the future -> unexpired
Mockito.when(sessionDao.queryByUserId(1)).thenReturn(getSessions());

Session session = sessionService.createSessionIfAbsent(user);

Assertions.assertNotNull(session);
Assertions.assertEquals(sessionId, session.getId());
Mockito.verify(sessionDao).updateById(session);
Mockito.verify(sessionDao, Mockito.never()).deleteById(Mockito.anyString());
Mockito.verify(sessionDao, Mockito.never()).insert(Mockito.any(Session.class));
}

@Test
public void testCreateSessionIfAbsentReplacesExpiredSession() {
User user = new User();
user.setUserType(UserType.GENERAL_USER);
user.setId(1);
Session expired = getSession();
expired.setLastLoginTime(DateUtils.add(new Date(), Calendar.DAY_OF_MONTH, -40));
List<Session> sessions = new ArrayList<>();
sessions.add(expired);
Mockito.when(sessionDao.queryByUserId(1)).thenReturn(sessions);

Session session = sessionService.createSessionIfAbsent(user);

Assertions.assertNotNull(session);
Assertions.assertNotEquals(sessionId, session.getId());
Mockito.verify(sessionDao).deleteById(sessionId);
Mockito.verify(sessionDao).insert(Mockito.any(Session.class));
}

private Session getSession() {
Session session = new Session();
session.setId(sessionId);
Expand Down
Loading