From 89ef1ccc19bad208dbe0e4add8f27ca949839587 Mon Sep 17 00:00:00 2001
From: Mingyang Zhu <mzhu9@slb.com>
Date: Wed, 12 May 2021 16:15:41 -0500
Subject: [PATCH] address comments + correct the deployment.yaml container
liveness and readiness probe configuration
---
devops/azure/chart/templates/deployment.yaml | 9 ++++++++-
.../opengroup/osdu/partition/api/HealthCheck.java | 1 +
.../provider/interfaces/IHealthCheckService.java | 1 +
.../partition/service/DefaultHealthCheckImpl.java | 9 +++++++--
.../azure/service/HealthCheckServiceImpl.java | 5 +++++
.../gcp/service/HealthCheckServiceImpl.java | 13 -------------
.../ibm/service/HealthCheckServiceImpl.java | 13 -------------
7 files changed, 22 insertions(+), 29 deletions(-)
rename provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/service/HealthCheckServiceImpl.java => partition-core/src/main/java/org/opengroup/osdu/partition/service/DefaultHealthCheckImpl.java (54%)
delete mode 100644 provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/service/HealthCheckServiceImpl.java
delete mode 100644 provider/partition-ibm/src/main/java/org/opengroup/osdu/partition/provider/ibm/service/HealthCheckServiceImpl.java
diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml
index eccbf52b8..c65fc7ac9 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 79f09e81f..6047910f6 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 3a30421a4..70163e513 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 211a0d735..102bffb95 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 f20cb39cd..f18b5b4c3 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 1e794e88f..000000000
--- 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 22070f4d8..000000000
--- 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() {
-
- }
-}
--
GitLab