From 24a9826c74322f969d2bc97b3a3caad7e23855e7 Mon Sep 17 00:00:00 2001 From: Peter Nied Date: Wed, 22 May 2024 19:18:25 +0000 Subject: [PATCH 1/2] Reuse target client in doc reindexer Signed-off-by: Peter Nied --- RFS/src/main/java/com/rfs/ReindexFromSnapshot.java | 4 ++-- RFS/src/main/java/com/rfs/common/DocumentReindexer.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/RFS/src/main/java/com/rfs/ReindexFromSnapshot.java b/RFS/src/main/java/com/rfs/ReindexFromSnapshot.java index 9d15bd249..6ba31b4dd 100644 --- a/RFS/src/main/java/com/rfs/ReindexFromSnapshot.java +++ b/RFS/src/main/java/com/rfs/ReindexFromSnapshot.java @@ -298,13 +298,13 @@ public static void main(String[] args) throws InterruptedException { } logger.info("Index Metadata read successfully"); + OpenSearchClient targetClient = new OpenSearchClient(targetConnection); if ((movementType == MovementType.EVERYTHING) || (movementType == MovementType.METADATA)){ // ========================================================================================================== // Recreate the Indices // ========================================================================================================== logger.info("=================================================================="); logger.info("Attempting to recreate the indices..."); - OpenSearchClient targetClient = new OpenSearchClient(targetConnection); for (IndexMetadata.Data indexMetadata : indexMetadatas) { String reindexName = indexMetadata.getName() + indexSuffix; logger.info("Recreating index " + indexMetadata.getName() + " as " + reindexName + " on target..."); @@ -364,7 +364,7 @@ public static void main(String[] args) throws InterruptedException { String targetIndex = indexMetadata.getName() + indexSuffix; final int finalShardId = shardId; // Define in local context for the lambda - DocumentReindexer.reindex(targetIndex, documents, targetConnection) + DocumentReindexer.reindex(targetIndex, documents, targetClient) .doOnError(error -> logger.error("Error during reindexing: " + error)) .doOnSuccess(done -> logger.info("Reindexing completed for index " + targetIndex + ", shard " + finalShardId)) // Wait for the shard reindexing to complete before proceeding; fine in this demo script, but diff --git a/RFS/src/main/java/com/rfs/common/DocumentReindexer.java b/RFS/src/main/java/com/rfs/common/DocumentReindexer.java index f4c64e293..9b678596b 100644 --- a/RFS/src/main/java/com/rfs/common/DocumentReindexer.java +++ b/RFS/src/main/java/com/rfs/common/DocumentReindexer.java @@ -15,8 +15,7 @@ public class DocumentReindexer { private static final Logger logger = LogManager.getLogger(DocumentReindexer.class); private static final int MAX_BATCH_SIZE = 1000; // Arbitrarily chosen - public static Mono reindex(String indexName, Flux documentStream, ConnectionDetails targetConnection) throws Exception { - OpenSearchClient client = new OpenSearchClient(targetConnection); + public static Mono reindex(String indexName, Flux documentStream, OpenSearchClient client) throws Exception { return documentStream .map(DocumentReindexer::convertDocumentToBulkSection) // Convert each Document to part of a bulk operation From 5a0bf3aa3c0d53f327b21602dad42ebf367650c1 Mon Sep 17 00:00:00 2001 From: Andre Kurait Date: Thu, 23 May 2024 22:30:58 -0500 Subject: [PATCH 2/2] Fix Release Drafter for Gradle Restructuring Signed-off-by: Andre Kurait --- .github/workflows/release-drafter.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 711b11b01..73cf9f7a1 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -28,7 +28,7 @@ jobs: # Preface Traffic Capture version with 0. to signal interface immaturity run: | wget https://github.com/opensearch-project/opensearch-migrations/archive/refs/tags/${{ steps.get_data.outputs.version }}.tar.gz -O artifacts.tar.gz - (cd TrafficCapture && ../gradlew publishMavenJavaPublicationToMavenRepository -Dbuild.snapshot=false -Dbuild.version=0.${{ steps.get_data.outputs.version }} && tar -C build -cvf traffic-capture-artifacts.tar.gz repository) + ./gradlew publishMavenJavaPublicationToMavenRepository -Dbuild.snapshot=false -Dbuild.version=0.${{ steps.get_data.outputs.version }} && tar -C build -cvf traffic-capture-artifacts.tar.gz repository - name: Draft a release uses: softprops/action-gh-release@v2 with: @@ -36,4 +36,4 @@ jobs: generate_release_notes: true files: | artifacts.tar.gz - TrafficCapture/traffic-capture-artifacts.tar.gz + traffic-capture-artifacts.tar.gz