From d66c689f6dcb8f66d34371b5719dceabfbf71b32 Mon Sep 17 00:00:00 2001 From: Mohit Yadav <105265192+mohityadav766@users.noreply.github.com> Date: Thu, 9 Jan 2025 22:51:49 +0530 Subject: [PATCH] Add Indexing Stack (#19305) --- .../bundles/searchIndex/ElasticSearchIndexSink.java | 13 ++++++++++++- .../bundles/searchIndex/OpenSearchIndexSink.java | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/ElasticSearchIndexSink.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/ElasticSearchIndexSink.java index af2ca8bb53e..12bac6ad68d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/ElasticSearchIndexSink.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/ElasticSearchIndexSink.java @@ -86,7 +86,10 @@ public class ElasticSearchIndexSink implements BulkSink, Closeable { } catch (Exception e) { entityErrorList.add( new EntityError() - .withMessage("Failed to convert entity to request: " + e.getMessage()) + .withMessage( + String.format( + "Failed to convert entity to request: %s , Stack : %s", + e.getMessage(), ExceptionUtils.exceptionStackTraceAsString(e))) .withEntity(entity.toString())); LOG.error("Error converting entity to request", e); } @@ -173,6 +176,14 @@ public class ElasticSearchIndexSink implements BulkSink, Closeable { handleNonRetriableException(requests.size(), e); } } catch (Exception ex) { + entityErrorList.add( + new EntityError() + .withMessage( + String.format( + "Bulk request failed: %s, StackTrace: %s", + ex.getMessage(), + ExceptionUtils.exceptionStackTraceAsString(ex))) + .withEntity(requests.toString())); LOG.error("Bulk request retry attempt {}/{} failed", 1, maxRetries, ex); } finally { semaphore.release(); diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/OpenSearchIndexSink.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/OpenSearchIndexSink.java index 4a3b7384619..65ef6d1737c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/OpenSearchIndexSink.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/OpenSearchIndexSink.java @@ -87,7 +87,10 @@ public class OpenSearchIndexSink implements BulkSink, Closeable { } catch (Exception e) { entityErrorList.add( new EntityError() - .withMessage("Failed to convert entity to request: " + e.getMessage()) + .withMessage( + String.format( + "Failed to convert entity to request: %s , Stack : %s", + e.getMessage(), ExceptionUtils.exceptionStackTraceAsString(e))) .withEntity(entity.toString())); LOG.error("Error converting entity to request", e); } @@ -174,6 +177,14 @@ public class OpenSearchIndexSink implements BulkSink, Closeable { handleNonRetriableException(requests.size(), e); } } catch (Exception ex) { + entityErrorList.add( + new EntityError() + .withMessage( + String.format( + "Bulk request failed: %s, StackTrace: %s", + ex.getMessage(), + ExceptionUtils.exceptionStackTraceAsString(ex))) + .withEntity(requests.toString())); LOG.error("Bulk request retry attempt {}/{} failed", 1, maxRetries, ex); } finally { semaphore.release();