diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index eccbf52b861bb32a6ce9aa92829ad1c2a3fe225b..c65fc7ac9ad7eedd384b5c7ccc203a311910069c 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -48,7 +48,14 @@ spec: cpu: "300m" readinessProbe: httpGet: - path: /api/partition/v1/swagger-ui.html + path: {{ .Values.server.servlet.contextPath }}/_ah/readiness_check + port: 80 + periodSeconds: 30 + timeoutSeconds: 10 + failureThreshold: 3 + livenessProbe: + httpGet: + path: {{ .Values.server.servlet.contextPath }}/_ah/liveness_check port: 80 volumeMounts: - name: azure-keyvault diff --git a/partition-core/src/main/java/org/opengroup/osdu/partition/api/HealthCheck.java b/partition-core/src/main/java/org/opengroup/osdu/partition/api/HealthCheck.java index 79f09e81f7d564777740f1e007e4417ca0a164a2..6047910f64e38918aaffb6639d5f2cb6f998a89b 100644 --- a/partition-core/src/main/java/org/opengroup/osdu/partition/api/HealthCheck.java +++ b/partition-core/src/main/java/org/opengroup/osdu/partition/api/HealthCheck.java @@ -36,6 +36,7 @@ public class HealthCheck { @GetMapping("/liveness_check") public ResponseEntity<String> livenessCheck() { + healthCheckService.performLivenessCheck(); ResponseEntity responseEntity = new ResponseEntity<>("Partition service is alive", HttpStatus.OK); this.auditLogger.readServiceLivenessSuccess(Collections.singletonList(responseEntity.toString())); return responseEntity; diff --git a/partition-core/src/main/java/org/opengroup/osdu/partition/provider/interfaces/IHealthCheckService.java b/partition-core/src/main/java/org/opengroup/osdu/partition/provider/interfaces/IHealthCheckService.java index 3a30421a442362dd15b2697031c05662b06782c9..70163e5130459561ed0ca776e0fe23969bfcebfd 100644 --- a/partition-core/src/main/java/org/opengroup/osdu/partition/provider/interfaces/IHealthCheckService.java +++ b/partition-core/src/main/java/org/opengroup/osdu/partition/provider/interfaces/IHealthCheckService.java @@ -1,5 +1,6 @@ package org.opengroup.osdu.partition.provider.interfaces; public interface IHealthCheckService { + void performLivenessCheck(); void performReadinessCheck(); } diff --git a/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/service/HealthCheckServiceImpl.java b/partition-core/src/main/java/org/opengroup/osdu/partition/service/DefaultHealthCheckImpl.java similarity index 54% rename from provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/service/HealthCheckServiceImpl.java rename to partition-core/src/main/java/org/opengroup/osdu/partition/service/DefaultHealthCheckImpl.java index 211a0d7358fb623ac37327603f580223928de475..102bffb956a963163585d9a13d5e224814f00cab 100644 --- a/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/service/HealthCheckServiceImpl.java +++ b/partition-core/src/main/java/org/opengroup/osdu/partition/service/DefaultHealthCheckImpl.java @@ -1,10 +1,15 @@ -package org.opengroup.osdu.partition.provider.aws.service; +package org.opengroup.osdu.partition.service; import org.opengroup.osdu.partition.provider.interfaces.IHealthCheckService; import org.springframework.stereotype.Service; @Service -public class HealthCheckServiceImpl implements IHealthCheckService { +public class DefaultHealthCheckImpl implements IHealthCheckService { + + @Override + public void performLivenessCheck() { + + } @Override public void performReadinessCheck() { diff --git a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/service/HealthCheckServiceImpl.java b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/service/HealthCheckServiceImpl.java index f20cb39cd366ac43558c6524469a0399f6d8c58c..f18b5b4c384bd1843553a3fddd03ecca50fbe468 100644 --- a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/service/HealthCheckServiceImpl.java +++ b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/service/HealthCheckServiceImpl.java @@ -16,6 +16,11 @@ public class HealthCheckServiceImpl implements IHealthCheckService { @Qualifier("partitionServiceCache") private IPartitionServiceCache<String, PartitionInfo> partitionServiceCache; + @Override + public void performLivenessCheck() { + + } + /** * Cache layer must be ready before the pod can serve the traffic */ diff --git a/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/service/HealthCheckServiceImpl.java b/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/service/HealthCheckServiceImpl.java deleted file mode 100644 index 1e794e88f9aaf1362578f38523fd44241b239549..0000000000000000000000000000000000000000 --- a/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/service/HealthCheckServiceImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.opengroup.osdu.partition.provider.gcp.service; - -import org.opengroup.osdu.partition.provider.interfaces.IHealthCheckService; -import org.springframework.stereotype.Service; - -@Service -public class HealthCheckServiceImpl implements IHealthCheckService { - - @Override - public void performReadinessCheck() { - - } -} diff --git a/provider/partition-ibm/src/main/java/org/opengroup/osdu/partition/provider/ibm/service/HealthCheckServiceImpl.java b/provider/partition-ibm/src/main/java/org/opengroup/osdu/partition/provider/ibm/service/HealthCheckServiceImpl.java deleted file mode 100644 index 22070f4d83663f88ab48f26f0eee14df8fae5569..0000000000000000000000000000000000000000 --- a/provider/partition-ibm/src/main/java/org/opengroup/osdu/partition/provider/ibm/service/HealthCheckServiceImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.opengroup.osdu.partition.provider.ibm.service; - -import org.opengroup.osdu.partition.provider.interfaces.IHealthCheckService; -import org.springframework.stereotype.Service; - -@Service -public class HealthCheckServiceImpl implements IHealthCheckService { - - @Override - public void performReadinessCheck() { - - } -}