Merge pull request #3297 from lorthirk/fix-improveEsUpsertFailedError…

…Message Improve Upsert Failed Error Message in Elasticsearch REST Client
eclipse-kapua · Apr 27, 2021 · a2e1700 · a2e1700
2 parents 82c158b + 7a3971a
commit a2e1700
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...ain/java/org/eclipse/kapua/service/elasticsearch/client/rest/RestElasticsearchClient.java b/...ain/java/org/eclipse/kapua/service/elasticsearch/client/rest/RestElasticsearchClient.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.ParseException;
 import org.apache.http.util.EntityUtils;
 import org.eclipse.kapua.commons.metric.MetricServiceFactory;
@@ -240,6 +241,10 @@ public BulkUpdateResponse upsert(BulkUpdateRequest bulkUpdateRequest) throws Cli
                         if (failureNode != null) {
                             failureMessage = failureNode.asText();
                         }
+                        String reason = jsonNode.at("/error/reason").asText();
+                        if (StringUtils.isNotBlank(reason)) {
+                            failureMessage = reason;
+                        }
                         bulkResponse.add(new UpdateResponse(metricId, new TypeDescriptor(indexName, typeName), failureMessage));
                         LOG.info("Upsert failed [{}, {}, {}]", indexName, typeName, failureMessage);
                         continue;