From 11cf9873efb74723c51e985fa3fe031f8007f080 Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Thu, 19 Feb 2026 14:54:55 +0530 Subject: [PATCH 1/8] feat(healt,version): add health and version endpoints --- pom.xml | 28 ++- .../controller/health/HealthController.java | 83 +++++++ .../controller/version/VersionController.java | 58 ++--- .../iemr/tm/service/health/HealthService.java | 217 ++++++++++++++++++ .../tm/utils/JwtUserIdValidationFilter.java | 3 +- 5 files changed, 358 insertions(+), 31 deletions(-) create mode 100644 src/main/java/com/iemr/tm/controller/health/HealthController.java create mode 100644 src/main/java/com/iemr/tm/service/health/HealthService.java diff --git a/pom.xml b/pom.xml index 56d3b951..40e64be4 100644 --- a/pom.xml +++ b/pom.xml @@ -304,7 +304,7 @@ - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -348,6 +348,32 @@ maven-jar-plugin 3.0.2 + + io.github.git-commit-id + git-commit-id-maven-plugin + 9.0.2 + + + get-the-git-infos + + revision + + initialize + + + + true + ${project.build.outputDirectory}/git.properties + + ^git.branch$ + ^git.commit.id.abbrev$ + ^git.build.version$ + ^git.build.time$ + + false + false + + org.springframework.boot spring-boot-maven-plugin diff --git a/src/main/java/com/iemr/tm/controller/health/HealthController.java b/src/main/java/com/iemr/tm/controller/health/HealthController.java new file mode 100644 index 00000000..460d8581 --- /dev/null +++ b/src/main/java/com/iemr/tm/controller/health/HealthController.java @@ -0,0 +1,83 @@ +/* +* AMRIT – Accessible Medical Records via Integrated Technology +* Integrated EHR (Electronic Health Records) Solution +* +* Copyright (C) "Piramal Swasthya Management and Research Institute" +* +* This file is part of AMRIT. +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. +*/ + +package com.iemr.tm.controller.health; + +import java.time.Instant; +import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.iemr.tm.service.health.HealthService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; + +@RestController +@RequestMapping("/health") +@Tag(name = "Health Check", description = "APIs for checking infrastructure health status") +public class HealthController { + + private static final Logger logger = LoggerFactory.getLogger(HealthController.class); + + private final HealthService healthService; + + public HealthController(HealthService healthService) { + this.healthService = healthService; + } + + @GetMapping + @Operation(summary = "Check infrastructure health", + description = "Returns the health status of MySQL, Redis, and other configured services") + @ApiResponses({ + @ApiResponse(responseCode = "200", description = "All checked components are UP"), + @ApiResponse(responseCode = "503", description = "One or more critical services are DOWN") + }) + public ResponseEntity> checkHealth() { + logger.info("Health check endpoint called"); + + try { + Map healthStatus = healthService.checkHealth(); + String overallStatus = (String) healthStatus.get("status"); + + HttpStatus httpStatus = "UP".equals(overallStatus) ? HttpStatus.OK : HttpStatus.SERVICE_UNAVAILABLE; + + logger.debug("Health check completed with status: {}", overallStatus); + return new ResponseEntity<>(healthStatus, httpStatus); + + } catch (Exception e) { + logger.error("Unexpected error during health check", e); + + Map errorResponse = Map.of( + "status", "DOWN", + "timestamp", Instant.now().toString() + ); + + return new ResponseEntity<>(errorResponse, HttpStatus.SERVICE_UNAVAILABLE); + } + } +} diff --git a/src/main/java/com/iemr/tm/controller/version/VersionController.java b/src/main/java/com/iemr/tm/controller/version/VersionController.java index 336d34e8..d320cc8f 100644 --- a/src/main/java/com/iemr/tm/controller/version/VersionController.java +++ b/src/main/java/com/iemr/tm/controller/version/VersionController.java @@ -21,59 +21,59 @@ */ package com.iemr.tm.controller.version; -import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Properties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.iemr.tm.utils.response.OutputResponse; - import io.swagger.v3.oas.annotations.Operation; @RestController public class VersionController { - private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); + private final Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); + + private static final String UNKNOWN_VALUE = "unknown"; @Operation(summary = "Get version information") - @GetMapping(value = "/version") - public String versionInformation() { - OutputResponse output = new OutputResponse(); + @GetMapping(value = "/version", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity> versionInformation() { + Map response = new LinkedHashMap<>(); try { logger.info("version Controller Start"); - output.setResponse(readGitProperties()); + Properties gitProperties = loadGitProperties(); + response.put("buildTimestamp", gitProperties.getProperty("git.build.time", UNKNOWN_VALUE)); + response.put("version", gitProperties.getProperty("git.build.version", UNKNOWN_VALUE)); + response.put("branch", gitProperties.getProperty("git.branch", UNKNOWN_VALUE)); + response.put("commitHash", gitProperties.getProperty("git.commit.id.abbrev", UNKNOWN_VALUE)); } catch (Exception e) { - output.setError(e); + logger.error("Failed to load version information", e); + response.put("buildTimestamp", UNKNOWN_VALUE); + response.put("version", UNKNOWN_VALUE); + response.put("branch", UNKNOWN_VALUE); + response.put("commitHash", UNKNOWN_VALUE); } - logger.info("version Controller End"); - return output.toString(); - } - - private String readGitProperties() throws Exception { - ClassLoader classLoader = getClass().getClassLoader(); - InputStream inputStream = classLoader.getResourceAsStream("git.properties"); - - return readFromInputStream(inputStream); + return ResponseEntity.ok(response); } - private String readFromInputStream(InputStream inputStream) - throws IOException { - StringBuilder resultStringBuilder = new StringBuilder(); - try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) { - String line; - while ((line = br.readLine()) != null) { - resultStringBuilder.append(line).append("\n"); + private Properties loadGitProperties() throws IOException { + Properties properties = new Properties(); + try (InputStream input = getClass().getClassLoader() + .getResourceAsStream("git.properties")) { + if (input != null) { + properties.load(input); } } - return resultStringBuilder.toString(); + return properties; } } diff --git a/src/main/java/com/iemr/tm/service/health/HealthService.java b/src/main/java/com/iemr/tm/service/health/HealthService.java new file mode 100644 index 00000000..3c8cd070 --- /dev/null +++ b/src/main/java/com/iemr/tm/service/health/HealthService.java @@ -0,0 +1,217 @@ +/* +* AMRIT – Accessible Medical Records via Integrated Technology +* Integrated EHR (Electronic Health Records) Solution +* +* Copyright (C) "Piramal Swasthya Management and Research Institute" +* +* This file is part of AMRIT. +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. +*/ + +package com.iemr.tm.service.health; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.time.Instant; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.function.Supplier; +import jakarta.annotation.PreDestroy; +import javax.sql.DataSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +@Service +public class HealthService { + + private static final Logger logger = LoggerFactory.getLogger(HealthService.class); + + private static final String STATUS_KEY = "status"; + private static final String STATUS_UP = "UP"; + private static final String STATUS_DOWN = "DOWN"; + + private static final long MYSQL_TIMEOUT_SECONDS = 3; + private static final long REDIS_TIMEOUT_SECONDS = 3; + + private final DataSource dataSource; + private final RedisTemplate redisTemplate; + private final ExecutorService executorService; + + public HealthService(DataSource dataSource, + @Autowired(required = false) RedisTemplate redisTemplate) { + this.dataSource = dataSource; + this.redisTemplate = redisTemplate; + this.executorService = Executors.newFixedThreadPool(2); + } + + @PreDestroy + public void shutdown() { + executorService.shutdown(); + } + + public Map checkHealth() { + Map response = new LinkedHashMap<>(); + response.put("timestamp", Instant.now().toString()); + + Map> components = new LinkedHashMap<>(); + + // Check MySQL + Map mysqlStatus = new LinkedHashMap<>(); + performHealthCheck("MySQL", mysqlStatus, this::checkMySQLHealth); + components.put("mysql", mysqlStatus); + + // Check Redis + Map redisStatus = new LinkedHashMap<>(); + performHealthCheck("Redis", redisStatus, this::checkRedisHealth); + components.put("redis", redisStatus); + + response.put("components", components); + + // Overall status + boolean allUp = components.values().stream() + .allMatch(this::isHealthy); + response.put(STATUS_KEY, allUp ? STATUS_UP : STATUS_DOWN); + + return response; + } + + private HealthCheckResult checkMySQLHealth() { + CompletableFuture future = CompletableFuture.supplyAsync(() -> { + try (Connection connection = dataSource.getConnection(); + PreparedStatement stmt = connection.prepareStatement("SELECT 1 as health_check")) { + + stmt.setQueryTimeout((int) MYSQL_TIMEOUT_SECONDS); + + try (ResultSet rs = stmt.executeQuery()) { + if (rs.next()) { + return new HealthCheckResult(true, null); + } + } + + return new HealthCheckResult(false, "No result from health check query"); + + } catch (Exception e) { + logger.warn("MySQL health check failed: {}", e.getMessage()); + return new HealthCheckResult(false, "MySQL connection failed"); + } + }, executorService); + + try { + return future.get(MYSQL_TIMEOUT_SECONDS, TimeUnit.SECONDS); + } catch (TimeoutException e) { + future.cancel(true); + logger.warn("MySQL health check timed out"); + return new HealthCheckResult(false, "MySQL health check timed out"); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return new HealthCheckResult(false, "MySQL health check was interrupted"); + } catch (Exception e) { + logger.warn("MySQL health check failed: {}", e.getMessage()); + return new HealthCheckResult(false, "MySQL connection failed"); + } + } + + private HealthCheckResult checkRedisHealth() { + if (redisTemplate == null) { + return new HealthCheckResult(true, null); + } + + CompletableFuture future = null; + try { + future = CompletableFuture.supplyAsync(() -> { + try { + return redisTemplate.execute((org.springframework.data.redis.core.RedisCallback) (connection) -> connection.ping()); + } catch (Exception e) { + return null; + } + }, executorService); + + String pong = future.get(REDIS_TIMEOUT_SECONDS, TimeUnit.SECONDS); + + if ("PONG".equals(pong)) { + return new HealthCheckResult(true, null); + } + + return new HealthCheckResult(false, "Redis PING failed"); + + } catch (TimeoutException e) { + if (future != null) { + future.cancel(true); + } + logger.warn("Redis health check timed out"); + return new HealthCheckResult(false, "Redis health check timed out"); + } catch (InterruptedException e) { + logger.warn("Redis health check was interrupted"); + Thread.currentThread().interrupt(); + return new HealthCheckResult(false, "Redis health check was interrupted"); + } catch (Exception e) { + logger.warn("Redis health check failed: {}", e.getMessage()); + return new HealthCheckResult(false, "Redis connection failed"); + } + } + + private Map performHealthCheck(String componentName, + Map status, + Supplier checker) { + long startTime = System.currentTimeMillis(); + + try { + HealthCheckResult result = checker.get(); + long responseTime = System.currentTimeMillis() - startTime; + + status.put(STATUS_KEY, result.isHealthy ? STATUS_UP : STATUS_DOWN); + status.put("responseTimeMs", responseTime); + + if (result.error != null) { + status.put("error", result.error); + } + + return status; + + } catch (Exception e) { + long responseTime = System.currentTimeMillis() - startTime; + logger.error("{} health check failed with exception: {}", componentName, e.getMessage(), e); + + status.put(STATUS_KEY, STATUS_DOWN); + status.put("responseTimeMs", responseTime); + status.put("error", "Health check failed with an unexpected error"); + + return status; + } + } + + private boolean isHealthy(Map componentStatus) { + return STATUS_UP.equals(componentStatus.get(STATUS_KEY)); + } + + private static class HealthCheckResult { + final boolean isHealthy; + final String error; + + HealthCheckResult(boolean isHealthy, String error) { + this.isHealthy = isHealthy; + this.error = error; + } + } +} diff --git a/src/main/java/com/iemr/tm/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/tm/utils/JwtUserIdValidationFilter.java index 5d6c05b3..23dd21a8 100644 --- a/src/main/java/com/iemr/tm/utils/JwtUserIdValidationFilter.java +++ b/src/main/java/com/iemr/tm/utils/JwtUserIdValidationFilter.java @@ -78,7 +78,8 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo if (path.equals(contextPath + "/user/userAuthenticate") || path.equalsIgnoreCase(contextPath + "/user/logOutUserFromConcurrentSession") || path.startsWith(contextPath + "/swagger-ui") || path.startsWith(contextPath + "/v3/api-docs") - || path.startsWith(contextPath + "/user/refreshToken") || path.startsWith(contextPath + "/public")) { + || path.startsWith(contextPath + "/user/refreshToken") || path.startsWith(contextPath + "/public") + || path.equals(contextPath + "/version") || path.equals(contextPath + "/health")) { logger.info("Skipping filter for path: " + path); filterChain.doFilter(servletRequest, servletResponse); return; From 620619b78c004b68b29b0c1000bea08936a0f38b Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Thu, 19 Feb 2026 15:01:23 +0530 Subject: [PATCH 2/8] fix(health): improve Redis health semantics when not configured --- src/main/java/com/iemr/tm/service/health/HealthService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/tm/service/health/HealthService.java b/src/main/java/com/iemr/tm/service/health/HealthService.java index 3c8cd070..00582a15 100644 --- a/src/main/java/com/iemr/tm/service/health/HealthService.java +++ b/src/main/java/com/iemr/tm/service/health/HealthService.java @@ -134,7 +134,7 @@ private HealthCheckResult checkMySQLHealth() { private HealthCheckResult checkRedisHealth() { if (redisTemplate == null) { - return new HealthCheckResult(true, null); + return new HealthCheckResult(true, "Redis not configured — skipped"); } CompletableFuture future = null; From 3cdf51f23e94b622f23b1b3112548ca77323bd3a Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Sat, 21 Feb 2026 12:42:47 +0530 Subject: [PATCH 3/8] fix(health): scope PROCESSLIST lock-wait check to application DB user --- .../controller/health/HealthController.java | 5 +- .../iemr/tm/service/health/HealthService.java | 493 +++++++++++++++--- 2 files changed, 417 insertions(+), 81 deletions(-) diff --git a/src/main/java/com/iemr/tm/controller/health/HealthController.java b/src/main/java/com/iemr/tm/controller/health/HealthController.java index 460d8581..650bf402 100644 --- a/src/main/java/com/iemr/tm/controller/health/HealthController.java +++ b/src/main/java/com/iemr/tm/controller/health/HealthController.java @@ -54,7 +54,7 @@ public HealthController(HealthService healthService) { @Operation(summary = "Check infrastructure health", description = "Returns the health status of MySQL, Redis, and other configured services") @ApiResponses({ - @ApiResponse(responseCode = "200", description = "All checked components are UP"), + @ApiResponse(responseCode = "200", description = "Services are UP or DEGRADED (operational with warnings)"), @ApiResponse(responseCode = "503", description = "One or more critical services are DOWN") }) public ResponseEntity> checkHealth() { @@ -64,7 +64,8 @@ public ResponseEntity> checkHealth() { Map healthStatus = healthService.checkHealth(); String overallStatus = (String) healthStatus.get("status"); - HttpStatus httpStatus = "UP".equals(overallStatus) ? HttpStatus.OK : HttpStatus.SERVICE_UNAVAILABLE; + // Return 503 only if DOWN; 200 for both UP and DEGRADED (DEGRADED = operational with warnings) + HttpStatus httpStatus = "DOWN".equals(overallStatus) ? HttpStatus.SERVICE_UNAVAILABLE : HttpStatus.OK; logger.debug("Health check completed with status: {}", overallStatus); return new ResponseEntity<>(healthStatus, httpStatus); diff --git a/src/main/java/com/iemr/tm/service/health/HealthService.java b/src/main/java/com/iemr/tm/service/health/HealthService.java index 00582a15..22b74899 100644 --- a/src/main/java/com/iemr/tm/service/health/HealthService.java +++ b/src/main/java/com/iemr/tm/service/health/HealthService.java @@ -28,17 +28,25 @@ import java.time.Instant; import java.util.LinkedHashMap; import java.util.Map; -import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Supplier; import jakarta.annotation.PreDestroy; import javax.sql.DataSource; +import com.zaxxer.hikari.HikariDataSource; +import com.zaxxer.hikari.HikariPoolMXBean; +import java.lang.management.ManagementFactory; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import java.util.concurrent.locks.ReentrantReadWriteLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -47,16 +55,55 @@ public class HealthService { private static final Logger logger = LoggerFactory.getLogger(HealthService.class); + // Status constants private static final String STATUS_KEY = "status"; private static final String STATUS_UP = "UP"; private static final String STATUS_DOWN = "DOWN"; + private static final String STATUS_DEGRADED = "DEGRADED"; + // Severity levels and keys + private static final String SEVERITY_KEY = "severity"; + private static final String SEVERITY_OK = "OK"; + private static final String SEVERITY_WARNING = "WARNING"; + private static final String SEVERITY_CRITICAL = "CRITICAL"; + + // Response keys + private static final String ERROR_KEY = "error"; + private static final String MESSAGE_KEY = "message"; + private static final String RESPONSE_TIME_KEY = "responseTimeMs"; + + // Timeouts (in seconds) private static final long MYSQL_TIMEOUT_SECONDS = 3; private static final long REDIS_TIMEOUT_SECONDS = 3; + + // Advanced checks configuration + private static final long ADVANCED_CHECKS_TIMEOUT_MS = 500; // Strict timeout for advanced checks + private static final long ADVANCED_CHECKS_THROTTLE_SECONDS = 30; // Run at most once per 30 seconds + + // Performance threshold (milliseconds) - response time > 2000ms = DEGRADED + private static final long RESPONSE_TIME_THRESHOLD_MS = 2000; + + // Diagnostic event codes for concise logging + private static final String DIAGNOSTIC_LOCK_WAIT = "MYSQL_LOCK_WAIT"; + private static final String DIAGNOSTIC_DEADLOCK = "MYSQL_DEADLOCK"; + private static final String DIAGNOSTIC_SLOW_QUERIES = "MYSQL_SLOW_QUERIES"; + private static final String DIAGNOSTIC_POOL_EXHAUSTED = "MYSQL_POOL_EXHAUSTED"; + private static final String DIAGNOSTIC_LOG_TEMPLATE = "Diagnostic: {}"; private final DataSource dataSource; private final RedisTemplate redisTemplate; private final ExecutorService executorService; + + // Advanced checks throttling (thread-safe) + private volatile long lastAdvancedCheckTime = 0; + private volatile AdvancedCheckResult cachedAdvancedCheckResult = null; + private final ReentrantReadWriteLock advancedCheckLock = new ReentrantReadWriteLock(); + + // Deadlock check resilience - disable after first permission error + private volatile boolean deadlockCheckDisabled = false; + + // Advanced health checks enabled - static to avoid Spring property parsing issues + private static final boolean ADVANCED_HEALTH_CHECKS_ENABLED = true; public HealthService(DataSource dataSource, @Autowired(required = false) RedisTemplate redisTemplate) { @@ -67,107 +114,122 @@ public HealthService(DataSource dataSource, @PreDestroy public void shutdown() { - executorService.shutdown(); + if (executorService != null && !executorService.isShutdown()) { + try { + executorService.shutdown(); + if (!executorService.awaitTermination(5, TimeUnit.SECONDS)) { + executorService.shutdownNow(); + logger.warn("ExecutorService did not terminate gracefully"); + } + } catch (InterruptedException e) { + executorService.shutdownNow(); + Thread.currentThread().interrupt(); + logger.warn("ExecutorService shutdown interrupted", e); + } + } } public Map checkHealth() { Map response = new LinkedHashMap<>(); response.put("timestamp", Instant.now().toString()); - Map> components = new LinkedHashMap<>(); + Map mysqlStatus = new ConcurrentHashMap<>(); + Map redisStatus = new ConcurrentHashMap<>(); - // Check MySQL - Map mysqlStatus = new LinkedHashMap<>(); - performHealthCheck("MySQL", mysqlStatus, this::checkMySQLHealth); - components.put("mysql", mysqlStatus); + // Submit both checks concurrently using executorService for proper cancellation support + Future mysqlFuture = executorService.submit( + () -> performHealthCheck("MySQL", mysqlStatus, this::checkMySQLHealthSync)); + Future redisFuture = executorService.submit( + () -> performHealthCheck("Redis", redisStatus, this::checkRedisHealthSync)); + + // Wait for both checks to complete with combined timeout (shared deadline) + long maxTimeout = Math.max(MYSQL_TIMEOUT_SECONDS, REDIS_TIMEOUT_SECONDS) + 1; + long deadlineNs = System.nanoTime() + TimeUnit.SECONDS.toNanos(maxTimeout); + try { + mysqlFuture.get(maxTimeout, TimeUnit.SECONDS); + long remainingNs = deadlineNs - System.nanoTime(); + if (remainingNs > 0) { + redisFuture.get(remainingNs, TimeUnit.NANOSECONDS); + } else { + redisFuture.cancel(true); + } + } catch (TimeoutException e) { + logger.warn("Health check aggregate timeout after {} seconds", maxTimeout); + mysqlFuture.cancel(true); + redisFuture.cancel(true); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + logger.warn("Health check was interrupted"); + mysqlFuture.cancel(true); + redisFuture.cancel(true); + } catch (Exception e) { + logger.warn("Health check execution error: {}", e.getMessage()); + } + + // Ensure timed-out or unfinished components are marked DOWN + ensurePopulated(mysqlStatus, "MySQL"); + ensurePopulated(redisStatus, "Redis"); - // Check Redis - Map redisStatus = new LinkedHashMap<>(); - performHealthCheck("Redis", redisStatus, this::checkRedisHealth); + Map> components = new LinkedHashMap<>(); + components.put("mysql", mysqlStatus); components.put("redis", redisStatus); response.put("components", components); - // Overall status - boolean allUp = components.values().stream() - .allMatch(this::isHealthy); - response.put(STATUS_KEY, allUp ? STATUS_UP : STATUS_DOWN); + // Compute overall status + String overallStatus = computeOverallStatus(components); + response.put(STATUS_KEY, overallStatus); return response; } - private HealthCheckResult checkMySQLHealth() { - CompletableFuture future = CompletableFuture.supplyAsync(() -> { - try (Connection connection = dataSource.getConnection(); - PreparedStatement stmt = connection.prepareStatement("SELECT 1 as health_check")) { - - stmt.setQueryTimeout((int) MYSQL_TIMEOUT_SECONDS); - - try (ResultSet rs = stmt.executeQuery()) { - if (rs.next()) { - return new HealthCheckResult(true, null); - } + private void ensurePopulated(Map status, String componentName) { + if (!status.containsKey(STATUS_KEY)) { + status.put(STATUS_KEY, STATUS_DOWN); + status.put(SEVERITY_KEY, SEVERITY_CRITICAL); + status.put(ERROR_KEY, componentName + " health check did not complete in time"); + } + } + + private HealthCheckResult checkMySQLHealthSync() { + try (Connection connection = dataSource.getConnection(); + PreparedStatement stmt = connection.prepareStatement("SELECT 1 as health_check")) { + + stmt.setQueryTimeout((int) MYSQL_TIMEOUT_SECONDS); + + try (ResultSet rs = stmt.executeQuery()) { + if (rs.next()) { + // Basic health check passed, now run advanced checks with throttling + boolean isDegraded = performAdvancedMySQLChecksWithThrottle(connection); + return new HealthCheckResult(true, null, isDegraded); } - - return new HealthCheckResult(false, "No result from health check query"); - - } catch (Exception e) { - logger.warn("MySQL health check failed: {}", e.getMessage()); - return new HealthCheckResult(false, "MySQL connection failed"); } - }, executorService); - - try { - return future.get(MYSQL_TIMEOUT_SECONDS, TimeUnit.SECONDS); - } catch (TimeoutException e) { - future.cancel(true); - logger.warn("MySQL health check timed out"); - return new HealthCheckResult(false, "MySQL health check timed out"); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - return new HealthCheckResult(false, "MySQL health check was interrupted"); + + return new HealthCheckResult(false, "No result from health check query", false); + } catch (Exception e) { - logger.warn("MySQL health check failed: {}", e.getMessage()); - return new HealthCheckResult(false, "MySQL connection failed"); + logger.warn("MySQL health check failed: {}", e.getMessage(), e); + return new HealthCheckResult(false, "MySQL connection failed", false); } } - private HealthCheckResult checkRedisHealth() { + private HealthCheckResult checkRedisHealthSync() { if (redisTemplate == null) { - return new HealthCheckResult(true, "Redis not configured — skipped"); + return new HealthCheckResult(true, "Redis not configured — skipped", false); } - CompletableFuture future = null; try { - future = CompletableFuture.supplyAsync(() -> { - try { - return redisTemplate.execute((org.springframework.data.redis.core.RedisCallback) (connection) -> connection.ping()); - } catch (Exception e) { - return null; - } - }, executorService); - - String pong = future.get(REDIS_TIMEOUT_SECONDS, TimeUnit.SECONDS); + String pong = redisTemplate.execute((org.springframework.data.redis.core.RedisCallback) (connection) -> connection.ping()); if ("PONG".equals(pong)) { - return new HealthCheckResult(true, null); + return new HealthCheckResult(true, null, false); } - return new HealthCheckResult(false, "Redis PING failed"); + return new HealthCheckResult(false, "Redis PING failed", false); - } catch (TimeoutException e) { - if (future != null) { - future.cancel(true); - } - logger.warn("Redis health check timed out"); - return new HealthCheckResult(false, "Redis health check timed out"); - } catch (InterruptedException e) { - logger.warn("Redis health check was interrupted"); - Thread.currentThread().interrupt(); - return new HealthCheckResult(false, "Redis health check was interrupted"); } catch (Exception e) { - logger.warn("Redis health check failed: {}", e.getMessage()); - return new HealthCheckResult(false, "Redis connection failed"); + logger.warn("Redis health check failed: {}", e.getMessage(), e); + return new HealthCheckResult(false, "Redis connection failed", false); } } @@ -180,11 +242,30 @@ private Map performHealthCheck(String componentName, HealthCheckResult result = checker.get(); long responseTime = System.currentTimeMillis() - startTime; - status.put(STATUS_KEY, result.isHealthy ? STATUS_UP : STATUS_DOWN); - status.put("responseTimeMs", responseTime); + // Determine status: DOWN (unhealthy), DEGRADED (healthy but with issues), or UP + String componentStatus; + if (!result.isHealthy) { + componentStatus = STATUS_DOWN; + } else if (result.isDegraded) { + componentStatus = STATUS_DEGRADED; + } else { + componentStatus = STATUS_UP; + } + status.put(STATUS_KEY, componentStatus); + + // Set response time + status.put(RESPONSE_TIME_KEY, responseTime); + + // Determine severity based on health, response time, and degradation flags + String severity = determineSeverity(result.isHealthy, responseTime, result.isDegraded); + status.put(SEVERITY_KEY, severity); + // Include message or error based on health status if (result.error != null) { - status.put("error", result.error); + // Use MESSAGE_KEY for informational messages when healthy + // Use ERROR_KEY for actual error messages when unhealthy + String fieldKey = result.isHealthy ? MESSAGE_KEY : ERROR_KEY; + status.put(fieldKey, result.error); } return status; @@ -194,24 +275,278 @@ private Map performHealthCheck(String componentName, logger.error("{} health check failed with exception: {}", componentName, e.getMessage(), e); status.put(STATUS_KEY, STATUS_DOWN); - status.put("responseTimeMs", responseTime); - status.put("error", "Health check failed with an unexpected error"); + status.put(RESPONSE_TIME_KEY, responseTime); + status.put(SEVERITY_KEY, SEVERITY_CRITICAL); + status.put(ERROR_KEY, "Health check failed with an unexpected error"); return status; } } - private boolean isHealthy(Map componentStatus) { - return STATUS_UP.equals(componentStatus.get(STATUS_KEY)); + private String determineSeverity(boolean isHealthy, long responseTimeMs, boolean isDegraded) { + if (!isHealthy) { + return SEVERITY_CRITICAL; + } + + if (isDegraded) { + return SEVERITY_WARNING; + } + + if (responseTimeMs > RESPONSE_TIME_THRESHOLD_MS) { + return SEVERITY_WARNING; + } + + return SEVERITY_OK; + } + + private String computeOverallStatus(Map> components) { + boolean hasCritical = false; + boolean hasDegraded = false; + + for (Map componentStatus : components.values()) { + String status = (String) componentStatus.get(STATUS_KEY); + String severity = (String) componentStatus.get(SEVERITY_KEY); + + if (STATUS_DOWN.equals(status) || SEVERITY_CRITICAL.equals(severity)) { + hasCritical = true; + } + + if (STATUS_DEGRADED.equals(status)) { + hasDegraded = true; + } + + if (SEVERITY_WARNING.equals(severity)) { + hasDegraded = true; + } + } + + if (hasCritical) { + return STATUS_DOWN; + } + + if (hasDegraded) { + return STATUS_DEGRADED; + } + + return STATUS_UP; + } + + // Internal advanced health checks for MySQL - do not expose details in responses + private boolean performAdvancedMySQLChecksWithThrottle(Connection connection) { + if (!ADVANCED_HEALTH_CHECKS_ENABLED) { + return false; // Advanced checks disabled + } + + long currentTime = System.currentTimeMillis(); + + // Check throttle window - use read lock first for fast path + advancedCheckLock.readLock().lock(); + try { + if (cachedAdvancedCheckResult != null && + (currentTime - lastAdvancedCheckTime) < ADVANCED_CHECKS_THROTTLE_SECONDS * 1000) { + // Return cached result - within throttle window + return cachedAdvancedCheckResult.isDegraded; + } + } finally { + advancedCheckLock.readLock().unlock(); + } + + // Outside throttle window - acquire write lock and run checks + advancedCheckLock.writeLock().lock(); + try { + // Double-check after acquiring write lock + if (cachedAdvancedCheckResult != null && + (currentTime - lastAdvancedCheckTime) < ADVANCED_CHECKS_THROTTLE_SECONDS * 1000) { + return cachedAdvancedCheckResult.isDegraded; + } + + AdvancedCheckResult result = performAdvancedMySQLChecks(connection); + + // Cache the result + lastAdvancedCheckTime = currentTime; + cachedAdvancedCheckResult = result; + + return result.isDegraded; + } finally { + advancedCheckLock.writeLock().unlock(); + } + } + + private AdvancedCheckResult performAdvancedMySQLChecks(Connection connection) { + try { + boolean hasIssues = false; + + if (hasLockWaits(connection)) { + logger.warn(DIAGNOSTIC_LOG_TEMPLATE, DIAGNOSTIC_LOCK_WAIT); + hasIssues = true; + } + + if (hasDeadlocks(connection)) { + logger.warn(DIAGNOSTIC_LOG_TEMPLATE, DIAGNOSTIC_DEADLOCK); + hasIssues = true; + } + + if (hasSlowQueries(connection)) { + logger.warn(DIAGNOSTIC_LOG_TEMPLATE, DIAGNOSTIC_SLOW_QUERIES); + hasIssues = true; + } + + if (hasConnectionPoolExhaustion()) { + logger.warn(DIAGNOSTIC_LOG_TEMPLATE, DIAGNOSTIC_POOL_EXHAUSTED); + hasIssues = true; + } + + return new AdvancedCheckResult(hasIssues); + } catch (Exception e) { + logger.debug("Advanced MySQL checks encountered exception, marking degraded"); + return new AdvancedCheckResult(true); + } + } + + private boolean hasLockWaits(Connection connection) { + try (PreparedStatement stmt = connection.prepareStatement( + "SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST " + + "WHERE (state = 'Waiting for table metadata lock' " + + " OR state = 'Waiting for row lock' " + + " OR state = 'Waiting for lock') " + + "AND user = USER()")) { + stmt.setQueryTimeout(2); + try (ResultSet rs = stmt.executeQuery()) { + if (rs.next()) { + int lockCount = rs.getInt(1); + return lockCount > 0; + } + } + } catch (Exception e) { + logger.debug("Could not check for lock waits"); + } + return false; + } + + private boolean hasDeadlocks(Connection connection) { + // Skip deadlock check if already disabled due to permissions + if (deadlockCheckDisabled) { + return false; + } + + try (PreparedStatement stmt = connection.prepareStatement("SHOW ENGINE INNODB STATUS")) { + stmt.setQueryTimeout(2); + try (ResultSet rs = stmt.executeQuery()) { + if (rs.next()) { + String innodbStatus = rs.getString(3); + return innodbStatus != null && innodbStatus.contains("LATEST DETECTED DEADLOCK"); + } + } + } catch (java.sql.SQLException e) { + // Check if this is a permission error + if (e.getMessage() != null && + (e.getMessage().contains("Access denied") || + e.getMessage().contains("permission"))) { + // Disable this check permanently after first permission error + deadlockCheckDisabled = true; + logger.warn("Deadlock check disabled: Insufficient privileges"); + } else { + logger.debug("Could not check for deadlocks"); + } + } catch (Exception e) { + logger.debug("Could not check for deadlocks"); + } + return false; + } + + private boolean hasSlowQueries(Connection connection) { + try (PreparedStatement stmt = connection.prepareStatement( + "SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST " + + "WHERE command != 'Sleep' AND time > ? AND user NOT IN ('event_scheduler', 'system user')")) { + stmt.setQueryTimeout(2); + stmt.setInt(1, 10); // Queries running longer than 10 seconds + try (ResultSet rs = stmt.executeQuery()) { + if (rs.next()) { + int slowQueryCount = rs.getInt(1); + return slowQueryCount > 3; // Alert if more than 3 slow queries + } + } + } catch (Exception e) { + logger.debug("Could not check for slow queries"); + } + return false; + } + + private boolean hasConnectionPoolExhaustion() { + // Use HikariCP metrics if available + if (dataSource instanceof HikariDataSource hikariDataSource) { + try { + HikariPoolMXBean poolMXBean = hikariDataSource.getHikariPoolMXBean(); + + if (poolMXBean != null) { + int activeConnections = poolMXBean.getActiveConnections(); + int maxPoolSize = hikariDataSource.getMaximumPoolSize(); + + // Alert if > 80% of pool is exhausted + int threshold = (int) (maxPoolSize * 0.8); + return activeConnections > threshold; + } + } catch (Exception e) { + logger.debug("Could not retrieve HikariCP pool metrics"); + } + } + + // Fallback: try to get pool metrics via JMX if HikariCP is not directly available + return checkPoolMetricsViaJMX(); + } + + private boolean checkPoolMetricsViaJMX() { + try { + MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer(); + ObjectName objectName = new ObjectName("com.zaxxer.hikari:type=Pool (*)"); + var mBeans = mBeanServer.queryMBeans(objectName, null); + + for (var mBean : mBeans) { + if (evaluatePoolMetrics(mBeanServer, mBean.getObjectName())) { + return true; + } + } + } catch (Exception e) { + logger.debug("Could not access HikariCP pool metrics via JMX"); + } + + // No pool metrics available - disable this check + logger.debug("Pool exhaustion check disabled: HikariCP metrics unavailable"); + return false; + } + + private boolean evaluatePoolMetrics(MBeanServer mBeanServer, ObjectName objectName) { + try { + Integer activeConnections = (Integer) mBeanServer.getAttribute(objectName, "ActiveConnections"); + Integer maximumPoolSize = (Integer) mBeanServer.getAttribute(objectName, "MaximumPoolSize"); + + if (activeConnections != null && maximumPoolSize != null) { + int threshold = (int) (maximumPoolSize * 0.8); + return activeConnections > threshold; + } + } catch (Exception e) { + // Continue to next MBean + } + return false; + } + + private static class AdvancedCheckResult { + final boolean isDegraded; + + AdvancedCheckResult(boolean isDegraded) { + this.isDegraded = isDegraded; + } } private static class HealthCheckResult { final boolean isHealthy; final String error; + final boolean isDegraded; - HealthCheckResult(boolean isHealthy, String error) { + HealthCheckResult(boolean isHealthy, String error, boolean isDegraded) { this.isHealthy = isHealthy; this.error = error; + this.isDegraded = isDegraded; } } -} +} \ No newline at end of file From b30d5cc82b27c046acaab4b7ae43f1fcba573fb0 Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Sat, 21 Feb 2026 12:46:09 +0530 Subject: [PATCH 4/8] fix(health): Removed the unused import --- src/main/java/com/iemr/tm/service/health/HealthService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/iemr/tm/service/health/HealthService.java b/src/main/java/com/iemr/tm/service/health/HealthService.java index 22b74899..7d6c157a 100644 --- a/src/main/java/com/iemr/tm/service/health/HealthService.java +++ b/src/main/java/com/iemr/tm/service/health/HealthService.java @@ -46,7 +46,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; From bc4576133f111682f59fe78894b65bf43a490d35 Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Sun, 22 Feb 2026 22:05:27 +0530 Subject: [PATCH 5/8] fix(health): avoid blocking DB I/O under write lock and restore interrupt flag --- .../iemr/tm/service/health/HealthService.java | 243 ++++++++++-------- 1 file changed, 138 insertions(+), 105 deletions(-) diff --git a/src/main/java/com/iemr/tm/service/health/HealthService.java b/src/main/java/com/iemr/tm/service/health/HealthService.java index 7d6c157a..d76ca223 100644 --- a/src/main/java/com/iemr/tm/service/health/HealthService.java +++ b/src/main/java/com/iemr/tm/service/health/HealthService.java @@ -29,11 +29,13 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.concurrent.ExecutionException; import java.util.function.Supplier; import jakarta.annotation.PreDestroy; import javax.sql.DataSource; @@ -71,20 +73,21 @@ public class HealthService { private static final String MESSAGE_KEY = "message"; private static final String RESPONSE_TIME_KEY = "responseTimeMs"; + // Component names + private static final String MYSQL_COMPONENT = "MySQL"; + private static final String REDIS_COMPONENT = "Redis"; + // Timeouts (in seconds) private static final long MYSQL_TIMEOUT_SECONDS = 3; private static final long REDIS_TIMEOUT_SECONDS = 3; // Advanced checks configuration - private static final long ADVANCED_CHECKS_TIMEOUT_MS = 500; // Strict timeout for advanced checks + private static final long ADVANCED_CHECKS_TIMEOUT_MS = 500L; // ms — enforced below private static final long ADVANCED_CHECKS_THROTTLE_SECONDS = 30; // Run at most once per 30 seconds - - // Performance threshold (milliseconds) - response time > 2000ms = DEGRADED private static final long RESPONSE_TIME_THRESHOLD_MS = 2000; // Diagnostic event codes for concise logging private static final String DIAGNOSTIC_LOCK_WAIT = "MYSQL_LOCK_WAIT"; - private static final String DIAGNOSTIC_DEADLOCK = "MYSQL_DEADLOCK"; private static final String DIAGNOSTIC_SLOW_QUERIES = "MYSQL_SLOW_QUERIES"; private static final String DIAGNOSTIC_POOL_EXHAUSTED = "MYSQL_POOL_EXHAUSTED"; private static final String DIAGNOSTIC_LOG_TEMPLATE = "Diagnostic: {}"; @@ -92,23 +95,27 @@ public class HealthService { private final DataSource dataSource; private final RedisTemplate redisTemplate; private final ExecutorService executorService; + private final ExecutorService advancedCheckExecutor; // Advanced checks throttling (thread-safe) private volatile long lastAdvancedCheckTime = 0; private volatile AdvancedCheckResult cachedAdvancedCheckResult = null; private final ReentrantReadWriteLock advancedCheckLock = new ReentrantReadWriteLock(); + private final AtomicBoolean advancedCheckInProgress = new AtomicBoolean(false); - // Deadlock check resilience - disable after first permission error - private volatile boolean deadlockCheckDisabled = false; - - // Advanced health checks enabled - static to avoid Spring property parsing issues + // Advanced checks always enabled private static final boolean ADVANCED_HEALTH_CHECKS_ENABLED = true; public HealthService(DataSource dataSource, @Autowired(required = false) RedisTemplate redisTemplate) { this.dataSource = dataSource; this.redisTemplate = redisTemplate; - this.executorService = Executors.newFixedThreadPool(2); + this.executorService = Executors.newFixedThreadPool(6); + this.advancedCheckExecutor = Executors.newSingleThreadExecutor(r -> { + Thread t = new Thread(r, "health-advanced-check"); + t.setDaemon(true); + return t; + }); } @PreDestroy @@ -126,6 +133,9 @@ public void shutdown() { logger.warn("ExecutorService shutdown interrupted", e); } } + if (advancedCheckExecutor != null && !advancedCheckExecutor.isShutdown()) { + advancedCheckExecutor.shutdownNow(); + } } public Map checkHealth() { @@ -135,51 +145,67 @@ public Map checkHealth() { Map mysqlStatus = new ConcurrentHashMap<>(); Map redisStatus = new ConcurrentHashMap<>(); - // Submit both checks concurrently using executorService for proper cancellation support - Future mysqlFuture = executorService.submit( - () -> performHealthCheck("MySQL", mysqlStatus, this::checkMySQLHealthSync)); - Future redisFuture = executorService.submit( - () -> performHealthCheck("Redis", redisStatus, this::checkRedisHealthSync)); + if (!executorService.isShutdown()) { + performHealthChecks(mysqlStatus, redisStatus); + } - // Wait for both checks to complete with combined timeout (shared deadline) - long maxTimeout = Math.max(MYSQL_TIMEOUT_SECONDS, REDIS_TIMEOUT_SECONDS) + 1; - long deadlineNs = System.nanoTime() + TimeUnit.SECONDS.toNanos(maxTimeout); + ensurePopulated(mysqlStatus, MYSQL_COMPONENT); + ensurePopulated(redisStatus, REDIS_COMPONENT); + + Map> components = new LinkedHashMap<>(); + components.put("mysql", mysqlStatus); + components.put("redis", redisStatus); + + response.put("components", components); + response.put(STATUS_KEY, computeOverallStatus(components)); + + return response; + } + + private void performHealthChecks(Map mysqlStatus, Map redisStatus) { + Future mysqlFuture = null; + Future redisFuture = null; try { - mysqlFuture.get(maxTimeout, TimeUnit.SECONDS); - long remainingNs = deadlineNs - System.nanoTime(); - if (remainingNs > 0) { - redisFuture.get(remainingNs, TimeUnit.NANOSECONDS); - } else { - redisFuture.cancel(true); - } + mysqlFuture = executorService.submit( + () -> performHealthCheck(MYSQL_COMPONENT, mysqlStatus, this::checkMySQLHealthSync)); + redisFuture = executorService.submit( + () -> performHealthCheck(REDIS_COMPONENT, redisStatus, this::checkRedisHealthSync)); + + awaitHealthChecks(mysqlFuture, redisFuture); } catch (TimeoutException e) { - logger.warn("Health check aggregate timeout after {} seconds", maxTimeout); - mysqlFuture.cancel(true); - redisFuture.cancel(true); + logger.warn("Health check aggregate timeout after {} seconds", getMaxTimeout()); + cancelFutures(mysqlFuture, redisFuture); } catch (InterruptedException e) { Thread.currentThread().interrupt(); logger.warn("Health check was interrupted"); - mysqlFuture.cancel(true); - redisFuture.cancel(true); + cancelFutures(mysqlFuture, redisFuture); } catch (Exception e) { logger.warn("Health check execution error: {}", e.getMessage()); + cancelFutures(mysqlFuture, redisFuture); } + } + + private void awaitHealthChecks(Future mysqlFuture, Future redisFuture) throws TimeoutException, InterruptedException, ExecutionException { + long maxTimeout = getMaxTimeout(); + long deadlineNs = System.nanoTime() + TimeUnit.SECONDS.toNanos(maxTimeout); - // Ensure timed-out or unfinished components are marked DOWN - ensurePopulated(mysqlStatus, "MySQL"); - ensurePopulated(redisStatus, "Redis"); - - Map> components = new LinkedHashMap<>(); - components.put("mysql", mysqlStatus); - components.put("redis", redisStatus); - - response.put("components", components); - - // Compute overall status - String overallStatus = computeOverallStatus(components); - response.put(STATUS_KEY, overallStatus); + mysqlFuture.get(maxTimeout, TimeUnit.SECONDS); + long remainingNs = deadlineNs - System.nanoTime(); - return response; + if (remainingNs > 0) { + redisFuture.get(remainingNs, TimeUnit.NANOSECONDS); + } else { + redisFuture.cancel(true); + } + } + + private long getMaxTimeout() { + return Math.max(MYSQL_TIMEOUT_SECONDS, REDIS_TIMEOUT_SECONDS) + 1; + } + + private void cancelFutures(Future mysqlFuture, Future redisFuture) { + if (mysqlFuture != null) mysqlFuture.cancel(true); + if (redisFuture != null) redisFuture.cancel(true); } private void ensurePopulated(Map status, String componentName) { @@ -191,25 +217,24 @@ private void ensurePopulated(Map status, String componentName) { } private HealthCheckResult checkMySQLHealthSync() { + boolean basicPassed = false; try (Connection connection = dataSource.getConnection(); PreparedStatement stmt = connection.prepareStatement("SELECT 1 as health_check")) { stmt.setQueryTimeout((int) MYSQL_TIMEOUT_SECONDS); try (ResultSet rs = stmt.executeQuery()) { - if (rs.next()) { - // Basic health check passed, now run advanced checks with throttling - boolean isDegraded = performAdvancedMySQLChecksWithThrottle(connection); - return new HealthCheckResult(true, null, isDegraded); - } + basicPassed = rs.next(); } - - return new HealthCheckResult(false, "No result from health check query", false); - } catch (Exception e) { logger.warn("MySQL health check failed: {}", e.getMessage(), e); return new HealthCheckResult(false, "MySQL connection failed", false); } + if (!basicPassed) { + return new HealthCheckResult(false, "No result from health check query", false); + } + boolean isDegraded = performAdvancedMySQLChecksWithThrottle(); + return new HealthCheckResult(true, null, isDegraded); } private HealthCheckResult checkRedisHealthSync() { @@ -331,7 +356,7 @@ private String computeOverallStatus(Map> components) } // Internal advanced health checks for MySQL - do not expose details in responses - private boolean performAdvancedMySQLChecksWithThrottle(Connection connection) { + private boolean performAdvancedMySQLChecksWithThrottle() { if (!ADVANCED_HEALTH_CHECKS_ENABLED) { return false; // Advanced checks disabled } @@ -350,28 +375,72 @@ private boolean performAdvancedMySQLChecksWithThrottle(Connection connection) { advancedCheckLock.readLock().unlock(); } - // Outside throttle window - acquire write lock and run checks - advancedCheckLock.writeLock().lock(); - try { - // Double-check after acquiring write lock - if (cachedAdvancedCheckResult != null && - (currentTime - lastAdvancedCheckTime) < ADVANCED_CHECKS_THROTTLE_SECONDS * 1000) { - return cachedAdvancedCheckResult.isDegraded; + // Only one thread may submit; others fall back to the (stale) cache + if (!advancedCheckInProgress.compareAndSet(false, true)) { + advancedCheckLock.readLock().lock(); + try { + return cachedAdvancedCheckResult != null && cachedAdvancedCheckResult.isDegraded; + } finally { + advancedCheckLock.readLock().unlock(); } + } + + try { + // Outside throttle window - acquire write lock and run checks + Future future = advancedCheckExecutor.submit(this::performAdvancedMySQLChecks); + AdvancedCheckResult result = handleAdvancedChecksFuture(future); - AdvancedCheckResult result = performAdvancedMySQLChecks(connection); - - // Cache the result - lastAdvancedCheckTime = currentTime; - cachedAdvancedCheckResult = result; - - return result.isDegraded; + // Re-acquire write lock only to update the cache atomically + advancedCheckLock.writeLock().lock(); + try { + lastAdvancedCheckTime = currentTime; + cachedAdvancedCheckResult = result; + return result.isDegraded; + } finally { + advancedCheckLock.writeLock().unlock(); + } } finally { - advancedCheckLock.writeLock().unlock(); + advancedCheckInProgress.set(false); + } + } + + private AdvancedCheckResult handleAdvancedChecksFuture(Future future) { + try { + return future.get(ADVANCED_CHECKS_TIMEOUT_MS, TimeUnit.MILLISECONDS); + } catch (TimeoutException ex) { + logger.debug("Advanced MySQL checks timed out after {}ms", ADVANCED_CHECKS_TIMEOUT_MS); + future.cancel(true); + return new AdvancedCheckResult(true); // treat timeout as degraded + } catch (ExecutionException ex) { + future.cancel(true); + if (ex.getCause() instanceof InterruptedException) { + Thread.currentThread().interrupt(); + logger.debug("Advanced MySQL checks were interrupted"); + } else { + logger.debug("Advanced MySQL checks failed: {}", ex.getCause() != null ? ex.getCause().getMessage() : ex.getMessage()); + } + return new AdvancedCheckResult(true); + } catch (InterruptedException ex) { + Thread.currentThread().interrupt(); + logger.debug("Advanced MySQL checks interrupted"); + future.cancel(true); + return new AdvancedCheckResult(true); + } catch (Exception ex) { + logger.debug("Advanced MySQL checks failed: {}", ex.getMessage()); + future.cancel(true); + return new AdvancedCheckResult(true); + } + + private AdvancedCheckResult performAdvancedMySQLChecks() { + try (Connection connection = dataSource.getConnection()) { + return performAdvancedCheckLogic(connection); + } catch (Exception e) { + logger.debug("Advanced MySQL checks could not obtain connection: {}", e.getMessage()); + return new AdvancedCheckResult(true); } } - private AdvancedCheckResult performAdvancedMySQLChecks(Connection connection) { + private AdvancedCheckResult performAdvancedCheckLogic(Connection connection) { try { boolean hasIssues = false; @@ -380,11 +449,6 @@ private AdvancedCheckResult performAdvancedMySQLChecks(Connection connection) { hasIssues = true; } - if (hasDeadlocks(connection)) { - logger.warn(DIAGNOSTIC_LOG_TEMPLATE, DIAGNOSTIC_DEADLOCK); - hasIssues = true; - } - if (hasSlowQueries(connection)) { logger.warn(DIAGNOSTIC_LOG_TEMPLATE, DIAGNOSTIC_SLOW_QUERIES); hasIssues = true; @@ -408,7 +472,7 @@ private boolean hasLockWaits(Connection connection) { "WHERE (state = 'Waiting for table metadata lock' " + " OR state = 'Waiting for row lock' " + " OR state = 'Waiting for lock') " + - "AND user = USER()")) { + "AND user = SUBSTRING_INDEX(USER(), '@', 1)")) { stmt.setQueryTimeout(2); try (ResultSet rs = stmt.executeQuery()) { if (rs.next()) { @@ -422,37 +486,6 @@ private boolean hasLockWaits(Connection connection) { return false; } - private boolean hasDeadlocks(Connection connection) { - // Skip deadlock check if already disabled due to permissions - if (deadlockCheckDisabled) { - return false; - } - - try (PreparedStatement stmt = connection.prepareStatement("SHOW ENGINE INNODB STATUS")) { - stmt.setQueryTimeout(2); - try (ResultSet rs = stmt.executeQuery()) { - if (rs.next()) { - String innodbStatus = rs.getString(3); - return innodbStatus != null && innodbStatus.contains("LATEST DETECTED DEADLOCK"); - } - } - } catch (java.sql.SQLException e) { - // Check if this is a permission error - if (e.getMessage() != null && - (e.getMessage().contains("Access denied") || - e.getMessage().contains("permission"))) { - // Disable this check permanently after first permission error - deadlockCheckDisabled = true; - logger.warn("Deadlock check disabled: Insufficient privileges"); - } else { - logger.debug("Could not check for deadlocks"); - } - } catch (Exception e) { - logger.debug("Could not check for deadlocks"); - } - return false; - } - private boolean hasSlowQueries(Connection connection) { try (PreparedStatement stmt = connection.prepareStatement( "SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST " + From aadf4069b4d0b40ac80c9c96eb01b9d52bc2e852 Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Sun, 22 Feb 2026 22:19:05 +0530 Subject: [PATCH 6/8] fix: add missin close brace --- src/main/java/com/iemr/tm/service/health/HealthService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/iemr/tm/service/health/HealthService.java b/src/main/java/com/iemr/tm/service/health/HealthService.java index d76ca223..11747957 100644 --- a/src/main/java/com/iemr/tm/service/health/HealthService.java +++ b/src/main/java/com/iemr/tm/service/health/HealthService.java @@ -429,6 +429,7 @@ private AdvancedCheckResult handleAdvancedChecksFuture(Future Date: Mon, 23 Feb 2026 19:03:19 +0530 Subject: [PATCH 7/8] fix(health): cancel in-flight futures on generic failure --- .../iemr/tm/service/health/HealthService.java | 107 ++++-------------- 1 file changed, 24 insertions(+), 83 deletions(-) diff --git a/src/main/java/com/iemr/tm/service/health/HealthService.java b/src/main/java/com/iemr/tm/service/health/HealthService.java index 11747957..483747cf 100644 --- a/src/main/java/com/iemr/tm/service/health/HealthService.java +++ b/src/main/java/com/iemr/tm/service/health/HealthService.java @@ -56,37 +56,23 @@ public class HealthService { private static final Logger logger = LoggerFactory.getLogger(HealthService.class); - // Status constants private static final String STATUS_KEY = "status"; private static final String STATUS_UP = "UP"; private static final String STATUS_DOWN = "DOWN"; private static final String STATUS_DEGRADED = "DEGRADED"; - - // Severity levels and keys private static final String SEVERITY_KEY = "severity"; private static final String SEVERITY_OK = "OK"; private static final String SEVERITY_WARNING = "WARNING"; private static final String SEVERITY_CRITICAL = "CRITICAL"; - - // Response keys private static final String ERROR_KEY = "error"; private static final String MESSAGE_KEY = "message"; private static final String RESPONSE_TIME_KEY = "responseTimeMs"; - - // Component names - private static final String MYSQL_COMPONENT = "MySQL"; - private static final String REDIS_COMPONENT = "Redis"; - - // Timeouts (in seconds) private static final long MYSQL_TIMEOUT_SECONDS = 3; private static final long REDIS_TIMEOUT_SECONDS = 3; - // Advanced checks configuration - private static final long ADVANCED_CHECKS_TIMEOUT_MS = 500L; // ms — enforced below - private static final long ADVANCED_CHECKS_THROTTLE_SECONDS = 30; // Run at most once per 30 seconds + private static final long ADVANCED_CHECKS_THROTTLE_SECONDS = 30; private static final long RESPONSE_TIME_THRESHOLD_MS = 2000; - // Diagnostic event codes for concise logging private static final String DIAGNOSTIC_LOCK_WAIT = "MYSQL_LOCK_WAIT"; private static final String DIAGNOSTIC_SLOW_QUERIES = "MYSQL_SLOW_QUERIES"; private static final String DIAGNOSTIC_POOL_EXHAUSTED = "MYSQL_POOL_EXHAUSTED"; @@ -95,15 +81,12 @@ public class HealthService { private final DataSource dataSource; private final RedisTemplate redisTemplate; private final ExecutorService executorService; - private final ExecutorService advancedCheckExecutor; - // Advanced checks throttling (thread-safe) private volatile long lastAdvancedCheckTime = 0; private volatile AdvancedCheckResult cachedAdvancedCheckResult = null; private final ReentrantReadWriteLock advancedCheckLock = new ReentrantReadWriteLock(); private final AtomicBoolean advancedCheckInProgress = new AtomicBoolean(false); - // Advanced checks always enabled private static final boolean ADVANCED_HEALTH_CHECKS_ENABLED = true; public HealthService(DataSource dataSource, @@ -111,11 +94,6 @@ public HealthService(DataSource dataSource, this.dataSource = dataSource; this.redisTemplate = redisTemplate; this.executorService = Executors.newFixedThreadPool(6); - this.advancedCheckExecutor = Executors.newSingleThreadExecutor(r -> { - Thread t = new Thread(r, "health-advanced-check"); - t.setDaemon(true); - return t; - }); } @PreDestroy @@ -133,9 +111,6 @@ public void shutdown() { logger.warn("ExecutorService shutdown interrupted", e); } } - if (advancedCheckExecutor != null && !advancedCheckExecutor.isShutdown()) { - advancedCheckExecutor.shutdownNow(); - } } public Map checkHealth() { @@ -149,8 +124,8 @@ public Map checkHealth() { performHealthChecks(mysqlStatus, redisStatus); } - ensurePopulated(mysqlStatus, MYSQL_COMPONENT); - ensurePopulated(redisStatus, REDIS_COMPONENT); + ensurePopulated(mysqlStatus, "MySQL"); + ensurePopulated(redisStatus, "Redis"); Map> components = new LinkedHashMap<>(); components.put("mysql", mysqlStatus); @@ -167,9 +142,9 @@ private void performHealthChecks(Map mysqlStatus, Map redisFuture = null; try { mysqlFuture = executorService.submit( - () -> performHealthCheck(MYSQL_COMPONENT, mysqlStatus, this::checkMySQLHealthSync)); + () -> performHealthCheck("MySQL", mysqlStatus, this::checkMySQLHealthSync)); redisFuture = executorService.submit( - () -> performHealthCheck(REDIS_COMPONENT, redisStatus, this::checkRedisHealthSync)); + () -> performHealthCheck("Redis", redisStatus, this::checkRedisHealthSync)); awaitHealthChecks(mysqlFuture, redisFuture); } catch (TimeoutException e) { @@ -217,22 +192,20 @@ private void ensurePopulated(Map status, String componentName) { } private HealthCheckResult checkMySQLHealthSync() { - boolean basicPassed = false; try (Connection connection = dataSource.getConnection(); PreparedStatement stmt = connection.prepareStatement("SELECT 1 as health_check")) { stmt.setQueryTimeout((int) MYSQL_TIMEOUT_SECONDS); try (ResultSet rs = stmt.executeQuery()) { - basicPassed = rs.next(); + if (!rs.next()) { + return new HealthCheckResult(false, "No result from health check query", false); + } } } catch (Exception e) { logger.warn("MySQL health check failed: {}", e.getMessage(), e); return new HealthCheckResult(false, "MySQL connection failed", false); } - if (!basicPassed) { - return new HealthCheckResult(false, "No result from health check query", false); - } boolean isDegraded = performAdvancedMySQLChecksWithThrottle(); return new HealthCheckResult(true, null, isDegraded); } @@ -355,20 +328,17 @@ private String computeOverallStatus(Map> components) return STATUS_UP; } - // Internal advanced health checks for MySQL - do not expose details in responses private boolean performAdvancedMySQLChecksWithThrottle() { if (!ADVANCED_HEALTH_CHECKS_ENABLED) { - return false; // Advanced checks disabled + return false; } long currentTime = System.currentTimeMillis(); - // Check throttle window - use read lock first for fast path advancedCheckLock.readLock().lock(); try { if (cachedAdvancedCheckResult != null && (currentTime - lastAdvancedCheckTime) < ADVANCED_CHECKS_THROTTLE_SECONDS * 1000) { - // Return cached result - within throttle window return cachedAdvancedCheckResult.isDegraded; } } finally { @@ -386,9 +356,17 @@ private boolean performAdvancedMySQLChecksWithThrottle() { } try { - // Outside throttle window - acquire write lock and run checks - Future future = advancedCheckExecutor.submit(this::performAdvancedMySQLChecks); - AdvancedCheckResult result = handleAdvancedChecksFuture(future); + // Perform DB I/O outside the write lock to avoid lock contention + AdvancedCheckResult result; + try (Connection connection = dataSource.getConnection()) { + result = performAdvancedMySQLChecks(connection); + } catch (Exception e) { + if (e.getCause() instanceof InterruptedException) { + Thread.currentThread().interrupt(); + } + logger.debug("Failed to get connection for advanced checks: {}", e.getMessage()); + result = new AdvancedCheckResult(false); + } // Re-acquire write lock only to update the cache atomically advancedCheckLock.writeLock().lock(); @@ -403,45 +381,8 @@ private boolean performAdvancedMySQLChecksWithThrottle() { advancedCheckInProgress.set(false); } } - - private AdvancedCheckResult handleAdvancedChecksFuture(Future future) { - try { - return future.get(ADVANCED_CHECKS_TIMEOUT_MS, TimeUnit.MILLISECONDS); - } catch (TimeoutException ex) { - logger.debug("Advanced MySQL checks timed out after {}ms", ADVANCED_CHECKS_TIMEOUT_MS); - future.cancel(true); - return new AdvancedCheckResult(true); // treat timeout as degraded - } catch (ExecutionException ex) { - future.cancel(true); - if (ex.getCause() instanceof InterruptedException) { - Thread.currentThread().interrupt(); - logger.debug("Advanced MySQL checks were interrupted"); - } else { - logger.debug("Advanced MySQL checks failed: {}", ex.getCause() != null ? ex.getCause().getMessage() : ex.getMessage()); - } - return new AdvancedCheckResult(true); - } catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - logger.debug("Advanced MySQL checks interrupted"); - future.cancel(true); - return new AdvancedCheckResult(true); - } catch (Exception ex) { - logger.debug("Advanced MySQL checks failed: {}", ex.getMessage()); - future.cancel(true); - return new AdvancedCheckResult(true); - } - } - - private AdvancedCheckResult performAdvancedMySQLChecks() { - try (Connection connection = dataSource.getConnection()) { - return performAdvancedCheckLogic(connection); - } catch (Exception e) { - logger.debug("Advanced MySQL checks could not obtain connection: {}", e.getMessage()); - return new AdvancedCheckResult(true); - } - } - private AdvancedCheckResult performAdvancedCheckLogic(Connection connection) { + private AdvancedCheckResult performAdvancedMySQLChecks(Connection connection) { try { boolean hasIssues = false; @@ -490,13 +431,13 @@ private boolean hasLockWaits(Connection connection) { private boolean hasSlowQueries(Connection connection) { try (PreparedStatement stmt = connection.prepareStatement( "SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST " + - "WHERE command != 'Sleep' AND time > ? AND user NOT IN ('event_scheduler', 'system user')")) { + "WHERE command != 'Sleep' AND time > ? AND user = SUBSTRING_INDEX(USER(), '@', 1)")) { stmt.setQueryTimeout(2); - stmt.setInt(1, 10); // Queries running longer than 10 seconds + stmt.setInt(1, 10); try (ResultSet rs = stmt.executeQuery()) { if (rs.next()) { int slowQueryCount = rs.getInt(1); - return slowQueryCount > 3; // Alert if more than 3 slow queries + return slowQueryCount > 3; } } } catch (Exception e) { From 6f82ee0151c208b7122632f02484c03f9a9d69c6 Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Mon, 23 Feb 2026 19:16:15 +0530 Subject: [PATCH 8/8] fix(health): fail-open on advanced MySQL check exceptions to avoid false degraded state --- src/main/java/com/iemr/tm/service/health/HealthService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/tm/service/health/HealthService.java b/src/main/java/com/iemr/tm/service/health/HealthService.java index 483747cf..d18c76bc 100644 --- a/src/main/java/com/iemr/tm/service/health/HealthService.java +++ b/src/main/java/com/iemr/tm/service/health/HealthService.java @@ -404,7 +404,7 @@ private AdvancedCheckResult performAdvancedMySQLChecks(Connection connection) { return new AdvancedCheckResult(hasIssues); } catch (Exception e) { logger.debug("Advanced MySQL checks encountered exception, marking degraded"); - return new AdvancedCheckResult(true); + return new AdvancedCheckResult(false); } }