-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
feat(upgrades) Create new DataHubUpgrade + Restore Glossary Entities Bootstrap step #5099
Merged
jjoyce0510
merged 5 commits into
datahub-project:master
from
chriscollins3456:cc--public-datahub-upgrade
Jun 6, 2022
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
15 changes: 15 additions & 0 deletions
15
metadata-models/src/main/pegasus/com/linkedin/metadata/key/DataHubUpgradeKey.pdl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
namespace com.linkedin.metadata.key | ||
|
||
import com.linkedin.common.Urn | ||
|
||
/** | ||
* Key for a DataHubUpgrade | ||
*/ | ||
@Aspect = { | ||
"name": "dataHubUpgradeKey" | ||
} | ||
record DataHubUpgradeKey { | ||
|
||
id: string | ||
|
||
} |
20 changes: 20 additions & 0 deletions
20
metadata-models/src/main/pegasus/com/linkedin/upgrade/DataHubUpgradeRequest.pdl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
namespace com.linkedin.upgrade | ||
|
||
/** | ||
* Information collected when kicking off a DataHubUpgrade | ||
*/ | ||
@Aspect = { | ||
"name": "dataHubUpgradeRequest" | ||
} | ||
record DataHubUpgradeRequest { | ||
|
||
/** | ||
* Timestamp when we started this DataHubUpgrade | ||
*/ | ||
timestampMs: long | ||
|
||
/** | ||
* Version of this upgrade | ||
*/ | ||
version: string | ||
} |
20 changes: 20 additions & 0 deletions
20
metadata-models/src/main/pegasus/com/linkedin/upgrade/DataHubUpgradeResult.pdl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
namespace com.linkedin.upgrade | ||
|
||
/** | ||
* Information collected when a DataHubUpgrade successfully finishes | ||
*/ | ||
@Aspect = { | ||
"name": "dataHubUpgradeResult" | ||
} | ||
record DataHubUpgradeResult { | ||
|
||
/** | ||
* Timestamp when we started this DataHubUpgrade | ||
*/ | ||
timestampMs: long | ||
|
||
/** | ||
* Result map to place helpful information about this upgrade job | ||
*/ | ||
result: optional map[string, string] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
213 changes: 213 additions & 0 deletions
213
...vice/factories/src/main/java/com/linkedin/metadata/boot/steps/RestoreGlossaryIndices.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,213 @@ | ||
package com.linkedin.metadata.boot.steps; | ||
|
||
import com.linkedin.common.AuditStamp; | ||
import com.linkedin.common.urn.Urn; | ||
import com.linkedin.data.template.RecordTemplate; | ||
import com.linkedin.entity.EntityResponse; | ||
import com.linkedin.entity.EnvelopedAspectMap; | ||
import com.linkedin.events.metadata.ChangeType; | ||
import com.linkedin.glossary.GlossaryNodeInfo; | ||
import com.linkedin.glossary.GlossaryTermInfo; | ||
import com.linkedin.metadata.Constants; | ||
import com.linkedin.metadata.boot.BootstrapStep; | ||
import com.linkedin.metadata.entity.EntityService; | ||
import com.linkedin.metadata.key.DataHubUpgradeKey; | ||
import com.linkedin.metadata.models.AspectSpec; | ||
import com.linkedin.metadata.models.registry.EntityRegistry; | ||
import com.linkedin.metadata.search.EntitySearchService; | ||
import com.linkedin.metadata.search.SearchEntity; | ||
import com.linkedin.metadata.search.SearchResult; | ||
import com.linkedin.metadata.utils.EntityKeyUtils; | ||
import com.linkedin.metadata.utils.GenericRecordUtils; | ||
import com.linkedin.mxe.MetadataChangeProposal; | ||
import com.linkedin.upgrade.DataHubUpgradeRequest; | ||
import com.linkedin.upgrade.DataHubUpgradeResult; | ||
import lombok.RequiredArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
|
||
import javax.annotation.Nonnull; | ||
import java.util.Collections; | ||
import java.util.HashSet; | ||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.stream.Collectors; | ||
|
||
|
||
@Slf4j | ||
@RequiredArgsConstructor | ||
public class RestoreGlossaryIndices implements BootstrapStep { | ||
private static final String VERSION = "0"; | ||
private static final String UPGRADE_ID = "restore-glossary-indices-ui"; | ||
private static final Urn GLOSSARY_UPGRADE_URN = | ||
EntityKeyUtils.convertEntityKeyToUrn(new DataHubUpgradeKey().setId(UPGRADE_ID), Constants.DATA_HUB_UPGRADE_ENTITY_NAME); | ||
private static final Integer BATCH_SIZE = 1000; | ||
|
||
private final EntityService _entityService; | ||
private final EntitySearchService _entitySearchService; | ||
private final EntityRegistry _entityRegistry; | ||
|
||
@Override | ||
public String name() { | ||
return this.getClass().getSimpleName(); | ||
} | ||
|
||
@Nonnull | ||
@Override | ||
public ExecutionMode getExecutionMode() { | ||
return ExecutionMode.BLOCKING; | ||
} | ||
|
||
@Override | ||
public void execute() throws Exception { | ||
log.info("Attempting to run RestoreGlossaryIndices upgrade.."); | ||
try { | ||
if (_entityService.exists(GLOSSARY_UPGRADE_URN)) { | ||
log.info("Glossary Upgrade has run before. Skipping"); | ||
return; | ||
} | ||
|
||
final AspectSpec termAspectSpec = | ||
_entityRegistry.getEntitySpec(Constants.GLOSSARY_TERM_ENTITY_NAME).getAspectSpec(Constants.GLOSSARY_TERM_INFO_ASPECT_NAME); | ||
final AspectSpec nodeAspectSpec = | ||
_entityRegistry.getEntitySpec(Constants.GLOSSARY_NODE_ENTITY_NAME).getAspectSpec(Constants.GLOSSARY_NODE_INFO_ASPECT_NAME); | ||
final AuditStamp auditStamp = new AuditStamp().setActor(Urn.createFromString(Constants.SYSTEM_ACTOR)).setTime(System.currentTimeMillis()); | ||
|
||
final DataHubUpgradeRequest upgradeRequest = new DataHubUpgradeRequest().setTimestampMs(System.currentTimeMillis()).setVersion(VERSION); | ||
ingestUpgradeAspect(Constants.DATA_HUB_UPGRADE_REQUEST_ASPECT_NAME, upgradeRequest, auditStamp); | ||
|
||
final int totalTermsCount = getAndRestoreTermAspectIndices(0, auditStamp, termAspectSpec); | ||
int termsCount = BATCH_SIZE; | ||
while (termsCount < totalTermsCount) { | ||
getAndRestoreTermAspectIndices(termsCount, auditStamp, termAspectSpec); | ||
termsCount += BATCH_SIZE; | ||
} | ||
|
||
final int totalNodesCount = getAndRestoreNodeAspectIndices(0, auditStamp, nodeAspectSpec); | ||
int nodesCount = BATCH_SIZE; | ||
while (nodesCount < totalNodesCount) { | ||
getAndRestoreNodeAspectIndices(nodesCount, auditStamp, nodeAspectSpec); | ||
nodesCount += BATCH_SIZE; | ||
} | ||
|
||
final DataHubUpgradeResult upgradeResult = new DataHubUpgradeResult().setTimestampMs(System.currentTimeMillis()); | ||
ingestUpgradeAspect(Constants.DATA_HUB_UPGRADE_RESULT_ASPECT_NAME, upgradeResult, auditStamp); | ||
|
||
log.info("Successfully restored glossary index"); | ||
} catch (Exception e) { | ||
log.error("Error when running the RestoreGlossaryIndices Bootstrap Step", e); | ||
_entityService.deleteUrn(GLOSSARY_UPGRADE_URN); | ||
throw new RuntimeException("Error when running the RestoreGlossaryIndices Bootstrap Step", e); | ||
} | ||
} | ||
|
||
private void ingestUpgradeAspect(String aspectName, RecordTemplate aspect, AuditStamp auditStamp) { | ||
final MetadataChangeProposal upgradeProposal = new MetadataChangeProposal(); | ||
upgradeProposal.setEntityUrn(GLOSSARY_UPGRADE_URN); | ||
upgradeProposal.setEntityType(Constants.DATA_HUB_UPGRADE_ENTITY_NAME); | ||
upgradeProposal.setAspectName(aspectName); | ||
upgradeProposal.setAspect(GenericRecordUtils.serializeAspect(aspect)); | ||
upgradeProposal.setChangeType(ChangeType.UPSERT); | ||
jjoyce0510 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
_entityService.ingestProposal(upgradeProposal, auditStamp); | ||
} | ||
|
||
private int getAndRestoreTermAspectIndices(int start, AuditStamp auditStamp, AspectSpec termAspectSpec) throws Exception { | ||
SearchResult termsResult = _entitySearchService.search(Constants.GLOSSARY_TERM_ENTITY_NAME, "", null, null, start, BATCH_SIZE); | ||
List<Urn> termUrns = termsResult.getEntities().stream().map(SearchEntity::getEntity).collect(Collectors.toList()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's end early if termUrns is empty. Same with function below |
||
if (termUrns.size() == 0) { | ||
return 0; | ||
} | ||
final Map<Urn, EntityResponse> termInfoResponses = _entityService.getEntitiesV2( | ||
Constants.GLOSSARY_TERM_ENTITY_NAME, | ||
new HashSet<>(termUrns), | ||
Collections.singleton(Constants.GLOSSARY_TERM_INFO_ASPECT_NAME) | ||
); | ||
|
||
// Loop over Terms and produce changelog | ||
for (Urn termUrn: termUrns) { | ||
EntityResponse termEntityResponse = termInfoResponses.get(termUrn); | ||
if (termEntityResponse == null) { | ||
log.warn("Term not in set of entity responses {}", termUrn); | ||
continue; | ||
} | ||
GlossaryTermInfo termInfo = mapTermInfo(termEntityResponse); | ||
if (termInfo == null) { | ||
log.warn("Received null termInfo for urn {}", termUrn); | ||
continue; | ||
} | ||
|
||
_entityService.produceMetadataChangeLog( | ||
termUrn, | ||
Constants.GLOSSARY_TERM_ENTITY_NAME, | ||
Constants.GLOSSARY_TERM_INFO_ASPECT_NAME, | ||
termAspectSpec, | ||
null, | ||
termInfo, | ||
null, | ||
null, | ||
auditStamp, | ||
ChangeType.RESTATE); | ||
} | ||
|
||
return termsResult.getNumEntities(); | ||
} | ||
|
||
private int getAndRestoreNodeAspectIndices(int start, AuditStamp auditStamp, AspectSpec nodeAspectSpec) throws Exception { | ||
SearchResult nodesResult = _entitySearchService.search(Constants.GLOSSARY_NODE_ENTITY_NAME, "", null, null, start, BATCH_SIZE); | ||
List<Urn> nodeUrns = nodesResult.getEntities().stream().map(SearchEntity::getEntity).collect(Collectors.toList()); | ||
if (nodeUrns.size() == 0) { | ||
return 0; | ||
} | ||
final Map<Urn, EntityResponse> nodeInfoResponses = _entityService.getEntitiesV2( | ||
Constants.GLOSSARY_NODE_ENTITY_NAME, | ||
new HashSet<>(nodeUrns), | ||
Collections.singleton(Constants.GLOSSARY_NODE_INFO_ASPECT_NAME) | ||
); | ||
|
||
// Loop over Nodes and produce changelog | ||
for (Urn nodeUrn: nodeUrns) { | ||
EntityResponse nodeEntityResponse = nodeInfoResponses.get(nodeUrn); | ||
if (nodeEntityResponse == null) { | ||
log.warn("Node not in set of entity responses {}", nodeUrn); | ||
continue; | ||
} | ||
GlossaryNodeInfo nodeInfo = mapNodeInfo(nodeEntityResponse); | ||
if (nodeInfo == null) { | ||
log.warn("Received null nodeInfo for urn {}", nodeUrn); | ||
continue; | ||
} | ||
|
||
_entityService.produceMetadataChangeLog( | ||
nodeUrn, | ||
Constants.GLOSSARY_NODE_ENTITY_NAME, | ||
Constants.GLOSSARY_NODE_INFO_ASPECT_NAME, | ||
nodeAspectSpec, | ||
null, | ||
nodeInfo, | ||
null, | ||
null, | ||
auditStamp, | ||
ChangeType.RESTATE); | ||
} | ||
|
||
return nodesResult.getNumEntities(); | ||
} | ||
|
||
private GlossaryTermInfo mapTermInfo(EntityResponse entityResponse) { | ||
EnvelopedAspectMap aspectMap = entityResponse.getAspects(); | ||
if (!aspectMap.containsKey(Constants.GLOSSARY_TERM_INFO_ASPECT_NAME)) { | ||
return null; | ||
} | ||
|
||
return new GlossaryTermInfo(aspectMap.get(Constants.GLOSSARY_TERM_INFO_ASPECT_NAME).getValue().data()); | ||
} | ||
|
||
private GlossaryNodeInfo mapNodeInfo(EntityResponse entityResponse) { | ||
EnvelopedAspectMap aspectMap = entityResponse.getAspects(); | ||
if (!aspectMap.containsKey(Constants.GLOSSARY_NODE_INFO_ASPECT_NAME)) { | ||
return null; | ||
} | ||
|
||
return new GlossaryNodeInfo(aspectMap.get(Constants.GLOSSARY_NODE_INFO_ASPECT_NAME).getValue().data()); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dexter-mh-lee @chriscollins3456 This is probably where a retry-policy for upgrades should come into the framework! :p
For later!