admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source 
Closes gh-34372
This commit is contained in:
Sébastien Deleuze
2025-10-29 19:23:17 +01:00
parent 706ea2c213
commit 0bcff38f8e
1 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
+12 -22
View File
@@ -714,14 +714,8 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
*/
private class CracResourceAdapter implements org.crac.Resource {
private CyclicBarrier stepToRestore = new CyclicBarrier(2);
private CyclicBarrier finishRestore = new CyclicBarrier(2);
private void preventShutdown() {
waitBarrier(this.stepToRestore);
// Checkpoint happens here
waitBarrier(this.finishRestore);
}
private final CyclicBarrier beforeCheckpointBarrier = new CyclicBarrier(2);
private final CyclicBarrier afterRestoreBarrier = new CyclicBarrier(2);
@Override
public void beforeCheckpoint(org.crac.Context<? extends org.crac.Resource> context) {
@@ -733,26 +727,22 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
stopForRestart();
}
private void preventShutdown() {
awaitBarrier(this.beforeCheckpointBarrier);
// Checkpoint happens here
awaitBarrier(this.afterRestoreBarrier);
}
@Override
public void afterRestore(org.crac.Context<? extends org.crac.Resource> context) {
// Unlock barrier for beforeCheckpoint
try {
this.stepToRestore.await();
}
catch (Exception ex) {
logger.trace("Exception from stepToRestore barrier", ex);
}
awaitBarrier(this.beforeCheckpointBarrier);
logger.info("Restarting Spring-managed lifecycle beans after JVM restore");
restartAfterStop();
// Unlock barrier for afterRestore to shutdown "prevent-shutdown" thread
try {
this.finishRestore.await();
}
catch (Exception ex) {
logger.trace("Exception from stepToRestore barrier", ex);
}
awaitBarrier(this.afterRestoreBarrier);
if (!checkpointOnRefresh) {
logger.info("Spring-managed lifecycle restart completed (restored JVM running for " +
@@ -760,12 +750,12 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
}
}
private void waitBarrier(CyclicBarrier barrier) {
private void awaitBarrier(CyclicBarrier barrier) {
try {
barrier.await();
}
catch (Exception ex) {
logger.trace("Exception from prevent-shutdown barrier", ex);
logger.trace("Exception from barrier", ex);
}
}
}