Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ingest): invalid urn should not fail full batch of changes #11187

Merged
merged 2 commits into from
Aug 15, 2024
Merged

fix(ingest): invalid urn should not fail full batch of changes #11187

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1af573
fix(ingest): invalid urn should not fail full batch of changes
RyanHolstien Aug 15, 2024
69cb80e
spotless
RyanHolstien Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions ...adata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,16 +170,20 @@ public AspectsBatchImplBuilder mcps(
mcps.stream()
.map(
mcp -> {
if (mcp.getChangeType().equals(ChangeType.PATCH)) {
return PatchItemImpl.PatchItemImplBuilder.build(
mcp,
auditStamp,
retrieverContext.getAspectRetriever().getEntityRegistry());
} else {
return ChangeItemImpl.ChangeItemImplBuilder.build(
mcp, auditStamp, retrieverContext.getAspectRetriever());
try {
if (mcp.getChangeType().equals(ChangeType.PATCH)) {
return PatchItemImpl.PatchItemImplBuilder.build(mcp, auditStamp,
retrieverContext.getAspectRetriever().getEntityRegistry());
} else {
return ChangeItemImpl.ChangeItemImplBuilder.build(mcp, auditStamp,
retrieverContext.getAspectRetriever());
}
} catch (IllegalArgumentException e) {
log.error("Invalid proposal, skipping and proceeding with batch: " + mcp, e);
return null;
}
})
.filter(Objects::nonNull)
.collect(Collectors.toList()));
return this;
}
Expand Down
39 changes: 36 additions & 3 deletions ...a-io-api/src/test/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
package com.linkedin.metadata.entity.ebean.batch;

import static com.linkedin.metadata.Constants.DATASET_ENTITY_NAME;
import static com.linkedin.metadata.Constants.STATUS_ASPECT_NAME;
import static com.linkedin.metadata.Constants.STRUCTURED_PROPERTIES_ASPECT_NAME;
import static com.linkedin.metadata.Constants.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;

import com.google.common.collect.ImmutableList;
import com.linkedin.common.FabricType;
import com.linkedin.common.Status;
import com.linkedin.common.urn.DataPlatformUrn;
import com.linkedin.common.urn.DatasetUrn;
import com.linkedin.common.urn.UrnUtils;
import com.linkedin.data.ByteString;
import com.linkedin.data.schema.annotation.PathSpecBasedSchemaAnnotationVisitor;
import com.linkedin.dataset.DatasetProperties;
import com.linkedin.events.metadata.ChangeType;
import com.linkedin.metadata.aspect.AspectRetriever;
import com.linkedin.metadata.aspect.GraphRetriever;
import com.linkedin.metadata.aspect.batch.MCPItem;
import com.linkedin.metadata.aspect.patch.GenericJsonPatch;
import com.linkedin.metadata.aspect.patch.PatchOperationType;
import com.linkedin.metadata.aspect.patch.builder.DatasetPropertiesPatchBuilder;
import com.linkedin.metadata.aspect.plugins.config.AspectPluginConfig;
import com.linkedin.metadata.aspect.plugins.hooks.MutationHook;
import com.linkedin.metadata.entity.SearchRetriever;
Expand Down Expand Up @@ -297,6 +301,35 @@ public void toUpsertBatchItemsProposedItemTest() {
"Mutation to status aspect");
}

@Test
public void singleInvalidDoesntBreakBatch() {
MetadataChangeProposal proposal1 =
new DatasetPropertiesPatchBuilder()
.urn(new DatasetUrn(new DataPlatformUrn("platform"), "name", FabricType.PROD))
.setDescription("something")
.setName("name")
.addCustomProperty("prop1", "propVal1")
.addCustomProperty("prop2", "propVal2")
.build();
MetadataChangeProposal proposal2 =
new MetadataChangeProposal()
.setEntityType(DATASET_ENTITY_NAME)
.setAspectName(DATASET_PROPERTIES_ASPECT_NAME)
.setAspect(GenericRecordUtils.serializeAspect(new DatasetProperties()))
.setChangeType(ChangeType.UPSERT);


AspectsBatchImpl testBatch =
AspectsBatchImpl.builder()
.mcps(ImmutableList.of(proposal1, proposal2), AuditStampUtils.createDefaultAuditStamp(), retrieverContext)
.retrieverContext(retrieverContext).build();

assertEquals(
testBatch.toUpsertBatchItems(Map.of()).getSecond().size(),
1,
"Expected 1 valid mcp to be passed through.");
}

/** Converts unsupported to status aspect */
@Getter
@Setter
Expand Down
Loading