Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/indexer-service

devops/gc/deploy/README.md

@@ -46,8 +46,8 @@ First you need to set variables in **values.yaml** file using any code editor. S
 
 | Name | Description | Type | Default |Required |
 |------|-------------|------|---------|---------|
-**data.requestsCpu** | amount of requested CPU | string | 0.1 | yes
-**data.requestsMemory** | amount of requested memory| string | 640M | yes
+**data.requestsCpu** | amount of requested CPU | string | 480m | yes
+**data.requestsMemory** | amount of requested memory| string | 700Mi | yes
 **data.limitsCpu** | CPU limit | string | 1 | yes
 **data.limitsMemory** | memory limit | string | 1G | yes
 **data.image** | service image | string | - | yes
@@ -72,9 +72,9 @@ First you need to set variables in **values.yaml** file using any code editor. S
 
 | Name | Description | Type | Default |Required |
 |------|-------------|------|---------|---------|
-**istio.proxyCPU** | CPU request for Envoy sidecars | string | 50m | yes
+**istio.proxyCPU** | CPU request for Envoy sidecars | string | 130m | yes
 **istio.proxyCPULimit** | CPU limit for Envoy sidecars | string | 500m | yes
-**istio.proxyMemory** | memory request for Envoy sidecars | string | 64Mi | yes
+**istio.proxyMemory** | memory request for Envoy sidecars | string | 100Mi | yes
 **istio.proxyMemoryLimit** | memory limit for Envoy sidecars | string | 512Mi | yes
 
 ### Install the helm chart

devops/gc/deploy/templates/deploy-redis.yaml

@@ -14,7 +14,8 @@ spec:
       labels:
         app: {{ printf "redis-%s" .Values.conf.appName | quote }}
       annotations:
-        sidecar.istio.io/proxyCPU: 30m
+        sidecar.istio.io/proxyCPU: 50m
+        sidecar.istio.io/proxyMemory: 100Mi
     spec:
       containers:
       - args:
@@ -31,5 +32,6 @@ spec:
           protocol: TCP
         resources:
           requests:
-            memory: 100Mi
+            cpu: 30m
+            memory: 50Mi
 {{ end }}

devops/gc/deploy/values.yaml

@@ -13,8 +13,8 @@ data:
   springProfilesActive: "gcp"
   storageHost: "http://storage"
   # Deployment
-  requestsCpu: "75m"
-  requestsMemory: "640M"
+  requestsCpu: "480m"
+  requestsMemory: "700Mi"
   limitsCpu: "1"
   limitsMemory: "1G"
   image: ""
@@ -36,7 +36,7 @@ conf:
   indexerRedisSecretName: "indexer-redis-secret"
 
 istio:
-  proxyCPU: "25m"
+  proxyCPU: "130m"
   proxyCPULimit: "200m"
-  proxyMemory: "64Mi"
+  proxyMemory: "100Mi"
   proxyMemoryLimit: "256Mi"

indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java

@@ -116,6 +116,10 @@ public class StorageServiceImpl implements StorageService {
             throw new AppException(HttpStatus.SC_NOT_FOUND, "Invalid request", "Storage service returned empty response");
         }
 
+        if (response.getResponseCode() == 500) {
+            throw new AppException(RequestStatus.NO_RETRY, "Server error", String.format("Storage service error: %s", response.getBody()));
+        }
+
         Records records = null;
         try {
             records = this.objectMapper.readValue(bulkStorageData, Records.class);