yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-08-29 19:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(system-update): fix no wait flag (#7927)

Browse Source
This commit is contained in:
david-leifker 2023-04-30 08:12:11 -05:00 committed by GitHub
parent b1413c3e8c
commit 9ef281acf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
metadata-service/factories/src/main/java/com/linkedin/metadata/boot/factories/BootstrapManagerFactory.java
View File

@ -1,6 +1,5 @@
package com.linkedin.metadata.boot.factories; package com.linkedin.metadata.boot.factories;
import com.google.common.collect.ImmutableList;
import com.linkedin.gms.factory.config.ConfigurationProvider; import com.linkedin.gms.factory.config.ConfigurationProvider;
import com.linkedin.gms.factory.entity.EntityServiceFactory; import com.linkedin.gms.factory.entity.EntityServiceFactory;
import com.linkedin.gms.factory.entityregistry.EntityRegistryFactory; import com.linkedin.gms.factory.entityregistry.EntityRegistryFactory;
@ -28,8 +27,10 @@ import com.linkedin.metadata.entity.EntityService;
import com.linkedin.metadata.models.registry.EntityRegistry; import com.linkedin.metadata.models.registry.EntityRegistry;
import com.linkedin.metadata.search.EntitySearchService; import com.linkedin.metadata.search.EntitySearchService;
import com.linkedin.metadata.search.transformer.SearchDocumentTransformer; import com.linkedin.metadata.search.transformer.SearchDocumentTransformer;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
@ -99,23 +100,25 @@ public class BootstrapManagerFactory {
final RemoveClientIdAspectStep removeClientIdAspectStep = new RemoveClientIdAspectStep(_entityService); final RemoveClientIdAspectStep removeClientIdAspectStep = new RemoveClientIdAspectStep(_entityService);
final RestoreColumnLineageIndices restoreColumnLineageIndices = new RestoreColumnLineageIndices(_entityService, _entityRegistry); final RestoreColumnLineageIndices restoreColumnLineageIndices = new RestoreColumnLineageIndices(_entityService, _entityRegistry);
final IngestDefaultGlobalSettingsStep ingestSettingsStep = new IngestDefaultGlobalSettingsStep(_entityService); final IngestDefaultGlobalSettingsStep ingestSettingsStep = new IngestDefaultGlobalSettingsStep(_entityService);
final WaitForSystemUpdateStep waitForSystemUpdateStep = new WaitForSystemUpdateStep(_dataHubUpgradeKafkaListener, final WaitForSystemUpdateStep waitForSystemUpdateStep = _configurationProvider.getSystemUpdate().isWaitForSystemUpdate()
_configurationProvider); ? new WaitForSystemUpdateStep(_dataHubUpgradeKafkaListener, _configurationProvider) : null;
final List<BootstrapStep> finalSteps = new ArrayList<>(ImmutableList.of( final List<BootstrapStep> finalSteps = Stream.of(
waitForSystemUpdateStep, waitForSystemUpdateStep,
ingestRootUserStep, ingestRootUserStep,
ingestPoliciesStep, ingestPoliciesStep,
ingestRolesStep, ingestRolesStep,
ingestDataPlatformsStep, ingestDataPlatformsStep,
ingestDataPlatformInstancesStep, ingestDataPlatformInstancesStep,
_ingestRetentionPoliciesStep, _ingestRetentionPoliciesStep,
ingestSettingsStep, ingestSettingsStep,
restoreGlossaryIndicesStep, restoreGlossaryIndicesStep,
removeClientIdAspectStep, removeClientIdAspectStep,
restoreDbtSiblingsIndices, restoreDbtSiblingsIndices,
indexDataPlatformsStep, indexDataPlatformsStep,
restoreColumnLineageIndices)); restoreColumnLineageIndices)
.filter(Objects::nonNull)
.collect(Collectors.toList());
if (_upgradeDefaultBrowsePathsEnabled) { if (_upgradeDefaultBrowsePathsEnabled) {
finalSteps.add(new UpgradeDefaultBrowsePathsStep(_entityService)); finalSteps.add(new UpgradeDefaultBrowsePathsStep(_entityService));

3
metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/DataHubUpgradeKafkaListener.java
View File

@ -84,6 +84,9 @@ public class DataHubUpgradeKafkaListener implements ConsumerSeekAware, Bootstrap
log.info("Latest system update version: {}", event.getVersion()); log.info("Latest system update version: {}", event.getVersion());
if (expectedVersion.equals(event.getVersion())) { if (expectedVersion.equals(event.getVersion())) {
IS_UPDATED.getAndSet(true); IS_UPDATED.getAndSet(true);
} else if (!_configurationProvider.getSystemUpdate().isWaitForSystemUpdate()) {
log.warn("Wait for system update is disabled. Proceeding with startup.");
IS_UPDATED.getAndSet(true);
} else { } else {
log.warn("System version is not up to date: {}. Waiting for datahub-upgrade to complete...", expectedVersion); log.warn("System version is not up to date: {}. Waiting for datahub-upgrade to complete...", expectedVersion);
} }