From 61f82b3330d84724e461f3c0a69c0b86efcdc40f Mon Sep 17 00:00:00 2001 From: rng Date: Thu, 6 Feb 2025 17:17:05 +1100 Subject: [PATCH 1/2] Avoid timeout send user event --- .../aodn/esindexer/service/IndexCloudOptimizedServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indexer/src/main/java/au/org/aodn/esindexer/service/IndexCloudOptimizedServiceImpl.java b/indexer/src/main/java/au/org/aodn/esindexer/service/IndexCloudOptimizedServiceImpl.java index 4b0fc33c..fdab069a 100644 --- a/indexer/src/main/java/au/org/aodn/esindexer/service/IndexCloudOptimizedServiceImpl.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/service/IndexCloudOptimizedServiceImpl.java @@ -132,7 +132,7 @@ public List indexCloudOptimizedData(MetadataEntity entity, .ifPresent(responses::add); log.info("Finished execute bulk indexing records {} to index: {}", count, indexName); - callback.onComplete(responses); + callback.onProgress(responses); } catch (Exception e) { log.error("Exception thrown or not found while indexing cloud optimized data : {}", entity.getUuid(), e); From ecffaec9c7906c04378eb1a93c80c027a6d0f666 Mon Sep 17 00:00:00 2001 From: rng Date: Thu, 6 Feb 2025 17:21:09 +1100 Subject: [PATCH 2/2] Avoid timeout keep send user event --- .../aodn/esindexer/service/IndexCloudOptimizedServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indexer/src/main/java/au/org/aodn/esindexer/service/IndexCloudOptimizedServiceImpl.java b/indexer/src/main/java/au/org/aodn/esindexer/service/IndexCloudOptimizedServiceImpl.java index fdab069a..6371142b 100644 --- a/indexer/src/main/java/au/org/aodn/esindexer/service/IndexCloudOptimizedServiceImpl.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/service/IndexCloudOptimizedServiceImpl.java @@ -120,11 +120,12 @@ public List indexCloudOptimizedData(MetadataEntity entity, for (List entries : dataset) { if (entries != null) { for(StacItemModel entry: entries) { - log.debug("add dataset into b with UUID: {} and props: {}", entry.getUuid(), entry.getProperties()); + log.debug("add cloud data with UUID: {} and props: {}", entry.getUuid(), entry.getProperties()); count++; bulkRequestProcessor.processItem(entry.getUuid(), entry) .ifPresent(responses::add); } + callback.onProgress(String.format("Added... %d", count)); } } bulkRequestProcessor