Merge branch 'opensearch-project:main' into main

kkondaka · Aug 12, 2024 · b364d85 · b364d85
2 parents 6ee780e + 0e00df6
commit b364d85
Show file tree

Hide file tree

Showing 35 changed files with 858 additions and 246 deletions.
diff --git a/...ession/src/main/java/org/opensearch/dataprepper/expression/GenericRegexMatchOperator.java b/...ession/src/main/java/org/opensearch/dataprepper/expression/GenericRegexMatchOperator.java
@@ -37,6 +37,8 @@ public int getSymbol() {
     @Override
     public Boolean evaluate(final Object ... args) {
         checkArgument(args.length == 2, displayName + " requires operands length needs to be 2.");
+        if(args[0] == null)
+            return false;
         checkArgument(args[0] instanceof String, displayName + " requires left operand to be String.");
         checkArgument(args[1] instanceof String, displayName + " requires right operand to be String.");
         try {

diff --git a/.../java/org/opensearch/dataprepper/expression/GenericExpressionEvaluator_ConditionalIT.java b/.../java/org/opensearch/dataprepper/expression/GenericExpressionEvaluator_ConditionalIT.java
diff --git a/...xpression/src/test/java/org/opensearch/dataprepper/expression/RegexEqualOperatorTest.java b/...xpression/src/test/java/org/opensearch/dataprepper/expression/RegexEqualOperatorTest.java
@@ -12,6 +12,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.dataprepper.expression.antlr.DataPrepperExpressionParser;
 
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -64,4 +65,9 @@ void testEvalInValidArgType() {
     void testEvalInValidPattern() {
         assertThrows(IllegalArgumentException.class, () -> objectUnderTest.evaluate("a", "*"));
     }
+
+    @Test
+    void evaluate_with_null_lhs_returns_false() {
+        assertThat(objectUnderTest.evaluate(null, "a*"), equalTo(false));
+    }
 }
diff --git a/...ession/src/test/java/org/opensearch/dataprepper/expression/RegexNotEqualOperatorTest.java b/...ession/src/test/java/org/opensearch/dataprepper/expression/RegexNotEqualOperatorTest.java
@@ -12,6 +12,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.dataprepper.expression.antlr.DataPrepperExpressionParser;
 
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -64,4 +65,9 @@ void testEvalInValidArgType() {
     void testEvalInValidPattern() {
         assertThrows(IllegalArgumentException.class, () -> objectUnderTest.evaluate("a", "*"));
     }
+
+    @Test
+    void evaluate_with_null_lhs_returns_false() {
+        assertThat(objectUnderTest.evaluate(null, "a*"), equalTo(false));
+    }
 }
diff --git a/...arch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java b/...arch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java
@@ -448,9 +448,9 @@ public void doOutput(final Collection<Record<Event>> records) {
       }
 
       SerializedJson serializedJsonNode = null;
-      if (StringUtils.equals(action, OpenSearchBulkActions.UPDATE.toString()) ||
-          StringUtils.equals(action, OpenSearchBulkActions.UPSERT.toString()) ||
-          StringUtils.equals(action, OpenSearchBulkActions.DELETE.toString())) {
+      if (StringUtils.equals(eventAction, OpenSearchBulkActions.UPDATE.toString()) ||
+          StringUtils.equals(eventAction, OpenSearchBulkActions.UPSERT.toString()) ||
+          StringUtils.equals(eventAction, OpenSearchBulkActions.DELETE.toString())) {
             serializedJsonNode = SerializedJson.fromJsonNode(event.getJsonNode(), document);
       }
       BulkOperation bulkOperation;

diff --git a/data-prepper-plugins/rds-source/build.gradle b/data-prepper-plugins/rds-source/build.gradle
@@ -22,6 +22,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind'
 
     implementation 'com.zendesk:mysql-binlog-connector-java:0.29.2'
+    implementation 'com.mysql:mysql-connector-j:8.4.0'
 
     testImplementation project(path: ':data-prepper-test-common')
     testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'

diff --git a/...ns/rds-source/src/main/java/org/opensearch/dataprepper/plugins/source/rds/RdsService.java b/...ns/rds-source/src/main/java/org/opensearch/dataprepper/plugins/source/rds/RdsService.java
@@ -13,14 +13,17 @@
 import org.opensearch.dataprepper.model.event.EventFactory;
 import org.opensearch.dataprepper.model.record.Record;
 import org.opensearch.dataprepper.model.source.coordinator.enhanced.EnhancedSourceCoordinator;
-import org.opensearch.dataprepper.plugins.source.rds.export.ClusterSnapshotStrategy;
 import org.opensearch.dataprepper.plugins.source.rds.export.DataFileScheduler;
 import org.opensearch.dataprepper.plugins.source.rds.export.ExportScheduler;
 import org.opensearch.dataprepper.plugins.source.rds.export.ExportTaskManager;
-import org.opensearch.dataprepper.plugins.source.rds.export.InstanceSnapshotStrategy;
 import org.opensearch.dataprepper.plugins.source.rds.export.SnapshotManager;
-import org.opensearch.dataprepper.plugins.source.rds.export.SnapshotStrategy;
+import org.opensearch.dataprepper.plugins.source.rds.leader.ClusterApiStrategy;
+import org.opensearch.dataprepper.plugins.source.rds.leader.InstanceApiStrategy;
 import org.opensearch.dataprepper.plugins.source.rds.leader.LeaderScheduler;
+import org.opensearch.dataprepper.plugins.source.rds.leader.RdsApiStrategy;
+import org.opensearch.dataprepper.plugins.source.rds.model.DbMetadata;
+import org.opensearch.dataprepper.plugins.source.rds.schema.ConnectionManager;
+import org.opensearch.dataprepper.plugins.source.rds.schema.SchemaManager;
 import org.opensearch.dataprepper.plugins.source.rds.stream.BinlogClientFactory;
 import org.opensearch.dataprepper.plugins.source.rds.stream.StreamScheduler;
 import org.slf4j.Logger;
@@ -77,13 +80,16 @@ public RdsService(final EnhancedSourceCoordinator sourceCoordinator,
     public void start(Buffer<Record<Event>> buffer) {
         LOG.info("Start running RDS service");
         final List<Runnable> runnableList = new ArrayList<>();
-        leaderScheduler = new LeaderScheduler(sourceCoordinator, sourceConfig);
+
+        final RdsApiStrategy rdsApiStrategy = sourceConfig.isCluster() ?
+                new ClusterApiStrategy(rdsClient) : new InstanceApiStrategy(rdsClient);
+        final DbMetadata dbMetadata = rdsApiStrategy.describeDb(sourceConfig.getDbIdentifier());
+        leaderScheduler = new LeaderScheduler(
+                sourceCoordinator, sourceConfig, getSchemaManager(sourceConfig, dbMetadata), dbMetadata);
         runnableList.add(leaderScheduler);
 
         if (sourceConfig.isExportEnabled()) {
-            final SnapshotStrategy snapshotStrategy = sourceConfig.isCluster() ?
-                    new ClusterSnapshotStrategy(rdsClient) : new InstanceSnapshotStrategy(rdsClient);
-            final SnapshotManager snapshotManager = new SnapshotManager(snapshotStrategy);
+            final SnapshotManager snapshotManager = new SnapshotManager(rdsApiStrategy);
             final ExportTaskManager exportTaskManager = new ExportTaskManager(rdsClient);
             exportScheduler = new ExportScheduler(
                     sourceCoordinator, snapshotManager, exportTaskManager, s3Client, pluginMetrics);
@@ -94,7 +100,7 @@ public void start(Buffer<Record<Event>> buffer) {
         }
 
         if (sourceConfig.isStreamEnabled()) {
-            BinaryLogClient binaryLogClient = new BinlogClientFactory(sourceConfig, rdsClient).create();
+            BinaryLogClient binaryLogClient = new BinlogClientFactory(sourceConfig, rdsClient, dbMetadata).create();
             if (sourceConfig.getTlsConfig() == null || !sourceConfig.getTlsConfig().isInsecure()) {
                 binaryLogClient.setSSLMode(SSLMode.REQUIRED);
             } else {
@@ -128,4 +134,14 @@ public void shutdown() {
             executor.shutdownNow();
         }
     }
+
+    private SchemaManager getSchemaManager(final RdsSourceConfig sourceConfig, final DbMetadata dbMetadata) {
+        final ConnectionManager connectionManager = new ConnectionManager(
+                dbMetadata.getHostName(),
+                dbMetadata.getPort(),
+                sourceConfig.getAuthenticationConfig().getUsername(),
+                sourceConfig.getAuthenticationConfig().getPassword(),
+                !sourceConfig.getTlsConfig().isInsecure());
+        return new SchemaManager(connectionManager);
+    }
 }
diff --git a/...g/opensearch/dataprepper/plugins/source/rds/coordination/state/DataFileProgressState.java b/...g/opensearch/dataprepper/plugins/source/rds/coordination/state/DataFileProgressState.java
@@ -7,6 +7,9 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.util.List;
+import java.util.Map;
+
 public class DataFileProgressState {
 
     @JsonProperty("isLoaded")
@@ -21,6 +24,12 @@ public class DataFileProgressState {
     @JsonProperty("sourceTable")
     private String sourceTable;
 
+    /**
+     * Map of table name to primary keys
+     */
+    @JsonProperty("primaryKeyMap")
+    private Map<String, List<String>> primaryKeyMap;
+
     @JsonProperty("snapshotTime")
     private long snapshotTime;
 
@@ -63,4 +72,12 @@ public long getSnapshotTime() {
     public void setSnapshotTime(long snapshotTime) {
         this.snapshotTime = snapshotTime;
     }
+
+    public Map<String, List<String>> getPrimaryKeyMap() {
+        return primaryKeyMap;
+    }
+
+    public void setPrimaryKeyMap(Map<String, List<String>> primaryKeyMap) {
+        this.primaryKeyMap = primaryKeyMap;
+    }
 }
diff --git a/...org/opensearch/dataprepper/plugins/source/rds/coordination/state/ExportProgressState.java b/...org/opensearch/dataprepper/plugins/source/rds/coordination/state/ExportProgressState.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Progress state for an EXPORT partition
@@ -32,6 +33,12 @@ public class ExportProgressState {
     @JsonProperty("tables")
     private List<String> tables;
 
+    /**
+     * Map of table name to primary keys
+     */
+    @JsonProperty("primaryKeyMap")
+    private Map<String, List<String>> primaryKeyMap;
+
     @JsonProperty("kmsKeyId")
     private String kmsKeyId;
 
@@ -89,6 +96,14 @@ public void setTables(List<String> tables) {
         this.tables = tables;
     }
 
+    public Map<String, List<String>> getPrimaryKeyMap() {
+        return primaryKeyMap;
+    }
+
+    public void setPrimaryKeyMap(Map<String, List<String>> primaryKeyMap) {
+        this.primaryKeyMap = primaryKeyMap;
+    }
+
     public String getKmsKeyId() {
         return kmsKeyId;
     }

diff --git a/...ce/src/main/java/org/opensearch/dataprepper/plugins/source/rds/export/DataFileLoader.java b/...ce/src/main/java/org/opensearch/dataprepper/plugins/source/rds/export/DataFileLoader.java
@@ -93,8 +93,8 @@ public void run() {
 
                     DataFileProgressState progressState = dataFilePartition.getProgressState().get();
 
-                    // TODO: primary key to be obtained by querying database schema
-                    final String primaryKeyName = "id";
+                    final String fullTableName = progressState.getSourceDatabase() + "." + progressState.getSourceTable();
+                    final List<String> primaryKeys = progressState.getPrimaryKeyMap().getOrDefault(fullTableName, List.of());
 
                     final long snapshotTime = progressState.getSnapshotTime();
                     final long eventVersionNumber = snapshotTime - VERSION_OVERLAP_TIME_FOR_EXPORT.toMillis();
@@ -103,13 +103,14 @@ public void run() {
                                     record,
                                     progressState.getSourceDatabase(),
                                     progressState.getSourceTable(),
-                                    List.of(primaryKeyName),
+                                    primaryKeys,
                                     snapshotTime,
                                     eventVersionNumber));
                     bufferAccumulator.add(transformedRecord);
                     eventCount.getAndIncrement();
                     bytesProcessedSummary.record(bytes);
                 } catch (Exception e) {
+                    LOG.error("Failed to process record from object s3://{}/{}", bucket, objectKey, e);
                     throw new RuntimeException(e);
                 }
             });

diff --git a/...e/src/main/java/org/opensearch/dataprepper/plugins/source/rds/export/ExportScheduler.java b/...e/src/main/java/org/opensearch/dataprepper/plugins/source/rds/export/ExportScheduler.java
@@ -30,6 +30,7 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
@@ -189,12 +190,15 @@ private SnapshotInfo checkSnapshotStatus(String snapshotId, Duration timeout) {
         LOG.debug("Start checking status of snapshot {}", snapshotId);
         while (Instant.now().isBefore(endTime)) {
             SnapshotInfo snapshotInfo = snapshotManager.checkSnapshotStatus(snapshotId);
-            String status = snapshotInfo.getStatus();
-            // Valid snapshot statuses are: available, copying, creating
-            // The status should never be "copying" here
-            if (SnapshotStatus.AVAILABLE.getStatusName().equals(status)) {
-                LOG.info("Snapshot {} is available.", snapshotId);
-                return snapshotInfo;
+
+            if (snapshotInfo != null) {
+                String status = snapshotInfo.getStatus();
+                // Valid snapshot statuses are: available, copying, creating
+                // The status should never be "copying" here
+                if (SnapshotStatus.AVAILABLE.getStatusName().equals(status)) {
+                    LOG.info("Snapshot {} is available.", snapshotId);
+                    return snapshotInfo;
+                }
             }
 
             LOG.debug("Snapshot {} is still creating. Wait and check later", snapshotId);
@@ -272,7 +276,7 @@ private BiConsumer<String, Throwable> completeExport(ExportPartition exportParti
 
                 // Create data file partitions for processing S3 files
                 List<String> dataFileObjectKeys = getDataFileObjectKeys(bucket, prefix, exportTaskId);
-                createDataFilePartitions(bucket, exportTaskId, dataFileObjectKeys, snapshotTime);
+                createDataFilePartitions(bucket, exportTaskId, dataFileObjectKeys, snapshotTime, state.getPrimaryKeyMap());
 
                 completeExportPartition(exportPartition);
             }
@@ -301,7 +305,11 @@ private List<String> getDataFileObjectKeys(String bucket, String prefix, String
         return objectKeys;
     }
 
-    private void createDataFilePartitions(String bucket, String exportTaskId, List<String> dataFileObjectKeys, long snapshotTime) {
+    private void createDataFilePartitions(String bucket,
+                                          String exportTaskId,
+                                          List<String> dataFileObjectKeys,
+                                          long snapshotTime,
+                                          Map<String, List<String>> primaryKeyMap) {
         LOG.info("Total of {} data files generated for export {}", dataFileObjectKeys.size(), exportTaskId);
         AtomicInteger totalFiles = new AtomicInteger();
         for (final String objectKey : dataFileObjectKeys) {
@@ -313,6 +321,7 @@ private void createDataFilePartitions(String bucket, String exportTaskId, List<S
             progressState.setSourceDatabase(database);
             progressState.setSourceTable(table);
             progressState.setSnapshotTime(snapshotTime);
+            progressState.setPrimaryKeyMap(primaryKeyMap);
 
             DataFilePartition dataFilePartition = new DataFilePartition(exportTaskId, bucket, objectKey, Optional.of(progressState));
             sourceCoordinator.createPartition(dataFilePartition);

diff --git a/...e/src/main/java/org/opensearch/dataprepper/plugins/source/rds/export/SnapshotManager.java b/...e/src/main/java/org/opensearch/dataprepper/plugins/source/rds/export/SnapshotManager.java
@@ -5,14 +5,15 @@
 
 package org.opensearch.dataprepper.plugins.source.rds.export;
 
+import org.opensearch.dataprepper.plugins.source.rds.leader.RdsApiStrategy;
 import org.opensearch.dataprepper.plugins.source.rds.model.SnapshotInfo;
 
 import java.util.UUID;
 
 public class SnapshotManager {
-    private final SnapshotStrategy snapshotStrategy;
+    private final RdsApiStrategy snapshotStrategy;
 
-    public SnapshotManager(final SnapshotStrategy snapshotStrategy) {
+    public SnapshotManager(final RdsApiStrategy snapshotStrategy) {
         this.snapshotStrategy = snapshotStrategy;
     }
 

diff --git a/...e/rds/export/ClusterSnapshotStrategy.java → ...source/rds/leader/ClusterApiStrategy.java b/...e/rds/export/ClusterSnapshotStrategy.java → ...source/rds/leader/ClusterApiStrategy.java
@@ -3,30 +3,48 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins.source.rds.export;
+package org.opensearch.dataprepper.plugins.source.rds.leader;
 
+import org.opensearch.dataprepper.plugins.source.rds.model.DbMetadata;
 import org.opensearch.dataprepper.plugins.source.rds.model.SnapshotInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.services.rds.RdsClient;
 import software.amazon.awssdk.services.rds.model.CreateDbClusterSnapshotRequest;
 import software.amazon.awssdk.services.rds.model.CreateDbClusterSnapshotResponse;
+import software.amazon.awssdk.services.rds.model.DBCluster;
 import software.amazon.awssdk.services.rds.model.DescribeDbClusterSnapshotsRequest;
 import software.amazon.awssdk.services.rds.model.DescribeDbClusterSnapshotsResponse;
+import software.amazon.awssdk.services.rds.model.DescribeDbClustersRequest;
+import software.amazon.awssdk.services.rds.model.DescribeDbClustersResponse;
 
 import java.time.Instant;
 
 /**
  * This snapshot strategy works with RDS/Aurora Clusters
  */
-public class ClusterSnapshotStrategy implements SnapshotStrategy {
-    private static final Logger LOG = LoggerFactory.getLogger(ClusterSnapshotStrategy.class);
+public class ClusterApiStrategy implements RdsApiStrategy {
+    private static final Logger LOG = LoggerFactory.getLogger(ClusterApiStrategy.class);
     private final RdsClient rdsClient;
 
-    public ClusterSnapshotStrategy(final RdsClient rdsClient) {
+    public ClusterApiStrategy(final RdsClient rdsClient) {
         this.rdsClient = rdsClient;
     }
 
+    @Override
+    public DbMetadata describeDb(String dbIdentifier) {
+        final DescribeDbClustersRequest request = DescribeDbClustersRequest.builder()
+                .dbClusterIdentifier(dbIdentifier)
+                .build();
+        try {
+            final DescribeDbClustersResponse response = rdsClient.describeDBClusters(request);
+            final DBCluster dbCluster = response.dbClusters().get(0);
+            return new DbMetadata(dbIdentifier, dbCluster.endpoint(), dbCluster.port());
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to describe DB " + dbIdentifier, e);
+        }
+    }
+
     @Override
     public SnapshotInfo createSnapshot(String dbIdentifier, String snapshotId) {
         CreateDbClusterSnapshotRequest request = CreateDbClusterSnapshotRequest.builder()
@@ -54,11 +72,15 @@ public SnapshotInfo describeSnapshot(String snapshotId) {
                 .dbClusterSnapshotIdentifier(snapshotId)
                 .build();
 
-        DescribeDbClusterSnapshotsResponse response = rdsClient.describeDBClusterSnapshots(request);
-        String snapshotArn = response.dbClusterSnapshots().get(0).dbClusterSnapshotArn();
-        String status = response.dbClusterSnapshots().get(0).status();
-        Instant createTime = response.dbClusterSnapshots().get(0).snapshotCreateTime();
-
-        return new SnapshotInfo(snapshotId, snapshotArn, createTime, status);
+        try {
+            DescribeDbClusterSnapshotsResponse response = rdsClient.describeDBClusterSnapshots(request);
+            String snapshotArn = response.dbClusterSnapshots().get(0).dbClusterSnapshotArn();
+            String status = response.dbClusterSnapshots().get(0).status();
+            Instant createTime = response.dbClusterSnapshots().get(0).snapshotCreateTime();
+            return new SnapshotInfo(snapshotId, snapshotArn, createTime, status);
+        } catch (Exception e) {
+            LOG.error("Failed to describe snapshot {}", snapshotId, e);
+            return null;
+        }
     }
 }