Skip to content

Stop health check executors during shutdown #1783

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
IvanBorislavovDimitrov merged 1 commit into from
Feb 20, 2026
Merged

Stop health check executors during shutdown #1783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions ...ps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@ public final class Messages {
public static final String CHECKING_DATABASE_HEALTH = "Checking database health...";
public static final String CHECKING_OBJECT_STORE_HEALTH = "Checking object store health...";
public static final String CHECKING_FOR_INCREASED_LOCKS = "Checking for increased locks...";
public static final String SHUTTING_DOWN_APPLICATION_HEALTH_CALCULATOR = "Shutting down application health calculator...";
public static final String SKIPPING_HEALTH_STATUS_UPDATE_APPLICATION_IS_SHUTTING_DOWN = "Skipping health status update - application is shutting down";

// Audit log

Expand Down
47 changes: 32 additions & 15 deletions ...loudfoundry/multiapps/controller/core/application/health/ApplicationHealthCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
package org.cloudfoundry.multiapps.controller.core.application.health;

import java.text.MessageFormat;
import java.time.Duration;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.cloudfoundry.multiapps.common.SLException;
Expand All @@ -29,12 +15,28 @@
import org.cloudfoundry.multiapps.controller.persistence.services.FileStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

import java.text.MessageFormat;
import java.time.Duration;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;

@Named
public class ApplicationHealthCalculator {
public class ApplicationHealthCalculator implements DisposableBean {

private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationHealthCalculator.class);

Expand Down Expand Up @@ -69,6 +71,8 @@ public class ApplicationHealthCalculator {

private final ResilientOperationExecutor resilientOperationExecutor = getResilienceExecutor();

private volatile boolean isShuttingDown = false;

@Inject
public ApplicationHealthCalculator(@Autowired(required = false) FileStorage objectStoreFileStorage,
ApplicationConfiguration applicationConfiguration, DatabaseHealthService databaseHealthService,
Expand All @@ -85,6 +89,10 @@ protected void scheduleRegularHealthUpdate() {
}

protected void updateHealthStatus() {
if (isShuttingDown) {
LOGGER.debug(Messages.SKIPPING_HEALTH_STATUS_UPDATE_APPLICATION_IS_SHUTTING_DOWN);
return;
}
List<Callable<Boolean>> tasks = List.of(this::isObjectStoreFileStorageHealthy, this::isDatabaseHealthy,
this::checkForIncreasedLocksWithTimeout);
try {
Expand Down Expand Up @@ -232,4 +240,13 @@ protected ResilientOperationExecutor getResilienceExecutor() {
return new ResilientOperationExecutor();
}

@Override
public void destroy() {
LOGGER.info(Messages.SHUTTING_DOWN_APPLICATION_HEALTH_CALCULATOR);
isShuttingDown = true;
scheduler.shutdownNow();
taskExecutor.shutdownNow();
timeoutExecutor.shutdownNow();
}

}
Loading