Merge pull request #13 from gleonSun/kylin-2.6.1-4.x

KE-43831 Integrated Spring session cleanup in Kylin to prevent MySQL deadlock alerts
Kyligence · Nov 5, 2024 · 732a105 · 732a105
2 parents 8907fc0 + aa02c57
commit 732a105
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
-version=2.6.1-kylin-r4
+version=2.6.1-kylin-r5
 
 group_id=org.springframework.session
 artifact_id=spring-session-core

diff --git a/...springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfiguration.java b/...springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfiguration.java
@@ -42,6 +42,7 @@
 import org.springframework.jdbc.support.lob.DefaultLobHandler;
 import org.springframework.jdbc.support.lob.LobHandler;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.annotation.SchedulingConfigurer;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.session.FlushMode;
@@ -296,6 +297,14 @@ public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
 					JdbcHttpSessionConfiguration.this.cleanupCron);
 		}
 
+		@Scheduled(cron = "${spring.session.jdbc.cleanup-cron-task:0 * * * * *}")
+		protected void cleanupSpringSession() {
+			String cleanFlag = System.getProperty("spring.session.jdbc.cleanup-flag");
+			if (Boolean.parseBoolean(cleanFlag)) {
+				this.sessionRepository.cleanUpExpiredSessions();
+			}
+		}
+
 	}
 
 }