Skip to content

Do not return database locks during health check #1738

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
Nov 26, 2025
Merged

Do not return database locks during health check #1738

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
1 change: 0 additions & 1 deletion ...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 @@ -98,7 +98,6 @@ public final class Messages {
public static final String ENVIRONMENT_VARIABLE_IS_NOT_SET_USING_DEFAULT = "Environment variable \"{0}\" is not set. Using default \"{1}\"...";
public static final String OPTIONAL_RESOURCE_IS_NOT_SERVICE = "Optional resource \"{0}\" it will be not created because it''s not a service";
public static final String SERVICE_IS_NOT_ACTIVE = "Service \"{0}\" is inactive and will not be processed";
public static final String DETECTED_INCREASED_NUMBER_OF_PROCESSES_WAITING_FOR_LOCKS_FOR_INSTANCE = "Detected increased number of processes waiting for locks: \"{0}\" for instance: \"{1}\"";
public static final String DETECTED_INCREASED_NUMBER_OF_PROCESSES_WAITING_FOR_LOCKS_FOR_INSTANCE_0_GETTING_THE_LOCKS = "Detected increased number of processes waiting for locks for instance {0}. Getting the locks...";

public static final String INVALID_VCAP_APPLICATION = "Invalid VCAP_APPLICATION \"{0}\"";
Expand Down
13 changes: 0 additions & 13 deletions ...loudfoundry/multiapps/controller/core/application/health/ApplicationHealthCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;
import java.util.function.Supplier;

import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.cloudfoundry.multiapps.common.SLException;
Expand All @@ -27,9 +25,7 @@
import org.cloudfoundry.multiapps.controller.core.application.health.model.ImmutableApplicationHealthResult;
import org.cloudfoundry.multiapps.controller.core.model.CachedObject;
import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
import org.cloudfoundry.multiapps.controller.core.util.ApplicationInstanceNameUtil;
import org.cloudfoundry.multiapps.controller.persistence.services.DatabaseHealthService;
import org.cloudfoundry.multiapps.controller.persistence.services.DatabaseMonitoringService;
import org.cloudfoundry.multiapps.controller.persistence.services.FileStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -50,7 +46,6 @@ public class ApplicationHealthCalculator {
private final FileStorage objectStoreFileStorage;
private final ApplicationConfiguration applicationConfiguration;
private final DatabaseHealthService databaseHealthService;
private final DatabaseMonitoringService databaseMonitoringService;
private final DatabaseWaitingLocksAnalyzer databaseWaitingLocksAnalyzer;

private final CachedObject<Boolean> objectStoreFileStorageHealthCache = new CachedObject<>(
Expand All @@ -77,12 +72,10 @@ public class ApplicationHealthCalculator {
@Inject
public ApplicationHealthCalculator(@Autowired(required = false) FileStorage objectStoreFileStorage,
ApplicationConfiguration applicationConfiguration, DatabaseHealthService databaseHealthService,
DatabaseMonitoringService databaseMonitoringService,
DatabaseWaitingLocksAnalyzer databaseWaitingLocksAnalyzer) {
this.objectStoreFileStorage = objectStoreFileStorage;
this.applicationConfiguration = applicationConfiguration;
this.databaseHealthService = databaseHealthService;
this.databaseMonitoringService = databaseMonitoringService;
this.databaseWaitingLocksAnalyzer = databaseWaitingLocksAnalyzer;
scheduleRegularHealthUpdate();
}
Expand Down Expand Up @@ -155,16 +148,10 @@ public ResponseEntity<ApplicationHealthResult> calculateApplicationHealth() {
LOGGER.warn(
MessageFormat.format(Messages.DETECTED_INCREASED_NUMBER_OF_PROCESSES_WAITING_FOR_LOCKS_FOR_INSTANCE_0_GETTING_THE_LOCKS,
applicationConfiguration.getApplicationInstanceIndex()));
long countOfProcessesWaitingForLocks = resilientOperationExecutor.execute(
(Supplier<Long>) () -> databaseMonitoringService.getProcessesWaitingForLocks(
ApplicationInstanceNameUtil.buildApplicationInstanceTemplate(applicationConfiguration)));
LOGGER.warn(MessageFormat.format(Messages.DETECTED_INCREASED_NUMBER_OF_PROCESSES_WAITING_FOR_LOCKS_FOR_INSTANCE,
countOfProcessesWaitingForLocks, applicationConfiguration.getApplicationInstanceIndex()));
return ResponseEntity.ok(ImmutableApplicationHealthResult.builder() // TODO: Make this return 503 instead of 200 when the
// detection is trustworthy
.status(ApplicationHealthResult.Status.DOWN)
.hasIncreasedLocks(true)
.countOfProcessesWaitingForLocks(countOfProcessesWaitingForLocks)
.build());
}
return ResponseEntity.ok(ImmutableApplicationHealthResult.builder()
Expand Down
14 changes: 7 additions & 7 deletions ...y/multiapps/controller/core/application/health/database/DatabaseWaitingLocksAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;

import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.cloudfoundry.multiapps.controller.core.Messages;
import org.cloudfoundry.multiapps.controller.core.model.CachedObject;
import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
Expand All @@ -16,9 +17,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import jakarta.inject.Inject;
import jakarta.inject.Named;

@Named
public class DatabaseWaitingLocksAnalyzer {

Expand Down Expand Up @@ -59,7 +57,8 @@ private void deleteObsoleteSamples() {
}

private void takeLocksSample() {
waitingLocksSamples.add(new CachedObject<>(databaseMonitoringService.getProcessesWaitingForLocks(ApplicationInstanceNameUtil.buildApplicationInstanceTemplate(applicationConfiguration)),
waitingLocksSamples.add(new CachedObject<>(databaseMonitoringService.getProcessesWaitingForLocks(
ApplicationInstanceNameUtil.buildApplicationInstanceTemplate(applicationConfiguration)),
MAXIMUM_VALIDITY_OF_LOCKS_SAMPLE_IN_MINUTES));
}

Expand All @@ -73,10 +72,11 @@ public synchronized boolean hasIncreasedDbLocks() {
double calculatedIncreasingOrEqualIndex = calculateIncreasingOrEqualIndex();
boolean hasIncreasedLocks = calculatedIncreasingOrEqualIndex >= MAXIMAL_ACCEPTABLE_INCREMENTAL_LOCKS_DEVIATION_INDEX
&& checkIfLastOneThirdOfSequenceHasIncreasedOrIsEqualComparedToFirstOneThird(minimumRequiredSamplesCount);
if (shouldLogValues()) {
if (hasIncreasedLocks || shouldLogValues()) {
LOGGER.info(MessageFormat.format(Messages.VALUES_IN_INSTANCE_IN_THE_WAITING_FOR_LOCKS_SAMPLES,
applicationConfiguration.getApplicationInstanceIndex(), waitingLocksSamples.stream()
.map(CachedObject::get)
.map(
CachedObject::get)
.toList()));
}
return hasIncreasedLocks;
Expand Down
4 changes: 0 additions & 4 deletions ...udfoundry/multiapps/controller/core/application/health/model/ApplicationHealthResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.cloudfoundry.multiapps.controller.client.facade.Nullable;
import org.immutables.value.Value;

@Value.Immutable
Expand All @@ -12,9 +11,6 @@ public interface ApplicationHealthResult {

Status getStatus();

@Nullable
Long countOfProcessesWaitingForLocks();

Boolean hasIncreasedLocks();

enum Status {
Expand Down
8 changes: 0 additions & 8 deletions ...foundry/multiapps/controller/core/application/health/ApplicationHealthCalculatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import org.cloudfoundry.multiapps.controller.core.application.health.model.ApplicationHealthResult;
import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
import org.cloudfoundry.multiapps.controller.persistence.services.DatabaseHealthService;
import org.cloudfoundry.multiapps.controller.persistence.services.DatabaseMonitoringService;
import org.cloudfoundry.multiapps.controller.persistence.services.JCloudsObjectStoreFileStorage;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand All @@ -15,7 +14,6 @@
import org.mockito.MockitoAnnotations;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand All @@ -29,8 +27,6 @@ class ApplicationHealthCalculatorTest {
@Mock
private DatabaseHealthService databaseHealthService;
@Mock
private DatabaseMonitoringService databaseMonitoringService;
@Mock
private DatabaseWaitingLocksAnalyzer databaseWaitingLocksAnalyzer;

private ApplicationHealthCalculator applicationHealthCalculator;
Expand All @@ -44,7 +40,6 @@ void setUp() throws Exception {
applicationHealthCalculator = new ApplicationHealthCalculatorMock(jCloudsObjectStoreFileStorage,
applicationConfiguration,
databaseHealthService,
databaseMonitoringService,
databaseWaitingLocksAnalyzer);
}

Expand Down Expand Up @@ -105,7 +100,6 @@ void testSuccessfulUpdateWithMissingObjectStore() {
applicationHealthCalculator = new ApplicationHealthCalculatorMock(null,
applicationConfiguration,
databaseHealthService,
databaseMonitoringService,
databaseWaitingLocksAnalyzer);
applicationHealthCalculator.updateHealthStatus();
ResponseEntity<ApplicationHealthResult> applicationHealthResultResponseEntity = applicationHealthCalculator.calculateApplicationHealth();
Expand All @@ -120,12 +114,10 @@ private static class ApplicationHealthCalculatorMock extends ApplicationHealthCa
public ApplicationHealthCalculatorMock(JCloudsObjectStoreFileStorage JCloudsObjectStoreFileStorage,
ApplicationConfiguration applicationConfiguration,
DatabaseHealthService databaseHealthService,
DatabaseMonitoringService databaseMonitoringService,
DatabaseWaitingLocksAnalyzer databaseWaitingLocksAnalyzer) {
super(JCloudsObjectStoreFileStorage,
applicationConfiguration,
databaseHealthService,
databaseMonitoringService,
databaseWaitingLocksAnalyzer);
}

Expand Down
Loading