-
Notifications
You must be signed in to change notification settings - Fork 36
Single repository restore #11492 #11721
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
Draft
vbradnitski
wants to merge
2
commits into
master
Choose a base branch
from
issue-11492
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 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
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -305,92 +305,125 @@ public SystemLoadResult load( final SystemLoadParams params ) | |
| throw new RepoLoadException( "Cannot load system-dump; dump does not contain system repository" ); | ||
| } | ||
|
|
||
| this.eventPublisher.publish( RepositoryEvents.restoreInitialized() ); | ||
| final RepositoryIds requestedRepositories = params.getRepositories(); | ||
| final boolean isPartialLoad = requestedRepositories != null && !requestedRepositories.isEmpty(); | ||
|
|
||
| if ( params.getListener() != null ) | ||
| { | ||
| final long branchesCount = dumpRepositories. | ||
| stream(). | ||
| flatMap( repositoryId -> dumpReader.getBranches( repositoryId ).stream() ). | ||
| count(); | ||
| doLoad( params, results, dumpReader, dumpRepositories, isPartialLoad ? requestedRepositories : null ); | ||
|
|
||
| params.getListener().totalBranches( branchesCount ); | ||
| } | ||
| this.eventPublisher.publish( RepositoryEvents.restored() ); | ||
| LOG.info( "Dump Load completed" ); | ||
| } | ||
| catch ( IOException e ) | ||
| { | ||
| throw new UncheckedIOException( e ); | ||
| } | ||
| return results.build(); | ||
| } | ||
|
|
||
| final boolean includeVersions = params.isIncludeVersions(); | ||
| private void doLoad( final SystemLoadParams params, final SystemLoadResult.Builder results, final DumpReader dumpReader, | ||
| final RepositoryIds dumpRepositories, final RepositoryIds requestedRepositories ) | ||
| { | ||
| final boolean isPartialLoad = requestedRepositories != null && !requestedRepositories.isEmpty(); | ||
|
|
||
| final RepositorySettings currentSystemSettings = | ||
| repositoryEntryService.getRepositoryEntry( SystemConstants.SYSTEM_REPO_ID ).getSettings(); | ||
| // Determine which repositories to load (excluding system-repo for partial load) | ||
| final RepositoryIds repositoriesToLoad = isPartialLoad ? dumpRepositories.stream() | ||
| .filter( requestedRepositories::contains ) | ||
| .filter( Predicate.isEqual( SystemConstants.SYSTEM_REPO_ID ).negate() ) | ||
| .collect( RepositoryIds.collector() ) : dumpRepositories; | ||
|
|
||
| final Map<RepositoryId, RepositorySettings> repoSettings = SYSTEM_REPO_IDS.stream() | ||
| .collect( | ||
| Collectors.toMap( Function.identity(), repo -> repositoryEntryService.getRepositoryEntry( repo ).getSettings() ) ); | ||
| this.eventPublisher.publish( RepositoryEvents.restoreInitialized() ); | ||
|
|
||
| repositoryEntryService.findRepositoryEntryIds(). | ||
| stream(). | ||
| filter( Predicate.isEqual( SystemConstants.SYSTEM_REPO_ID ). | ||
| or( SYSTEM_REPO_IDS::contains ). | ||
| negate() ). | ||
| forEach( this::doDeleteRepository ); | ||
| if ( params.getListener() != null ) | ||
| { | ||
| final long branchesCount = | ||
| repositoriesToLoad.stream().flatMap( repositoryId -> dumpReader.getBranches( repositoryId ).stream() ).count(); | ||
| params.getListener().totalBranches( branchesCount ); | ||
| } | ||
|
|
||
| SYSTEM_REPO_IDS.forEach( this::doDeleteRepository ); | ||
| final boolean includeVersions = params.isIncludeVersions(); | ||
|
|
||
| // system-repo must be deleted last | ||
| // Collect settings for repositories before deleting them | ||
| final Map<RepositoryId, RepositorySettings> repoSettings = repositoriesToLoad.stream() | ||
| .filter( repositoryId -> repositoryEntryService.getRepositoryEntry( repositoryId ) != null ) | ||
| .collect( Collectors.toMap( Function.identity(), repo -> repositoryEntryService.getRepositoryEntry( repo ).getSettings() ) ); | ||
|
|
||
| // Delete repositories | ||
| if ( isPartialLoad ) | ||
| { | ||
| RepositoryIds systemReposToDelete = | ||
| repositoriesToLoad.stream().filter( SYSTEM_REPO_IDS::contains ).collect( RepositoryIds.collector() ); | ||
|
Comment on lines
+353
to
+354
|
||
|
|
||
| // Partial load: delete only repositories that will be loaded | ||
| repositoriesToLoad.stream() | ||
| .filter( repositoryId -> repositoryEntryService.getRepositoryEntry( repositoryId ) != null ) | ||
| .filter( Predicate.not( SYSTEM_REPO_IDS::contains ) ) | ||
| .forEach( this::doDeleteRepository ); | ||
|
Comment on lines
+357
to
+360
|
||
|
|
||
| systemReposToDelete.forEach( this::doDeleteRepository ); | ||
|
|
||
| } | ||
| else | ||
| { | ||
| // Full load: delete all repositories (system-repo last) | ||
| repositoryEntryService.findRepositoryEntryIds() | ||
| .stream() | ||
| .filter( Predicate.isEqual( SystemConstants.SYSTEM_REPO_ID ).or( SYSTEM_REPO_IDS::contains ).negate() ) | ||
| .forEach( this::doDeleteRepository ); | ||
|
|
||
| SYSTEM_REPO_IDS.forEach( this::doDeleteRepository ); | ||
| doDeleteRepository( SystemConstants.SYSTEM_REPO_ID ); | ||
|
|
||
| // Load system-repo to be able to read repository settings and data | ||
| initAndLoad( includeVersions, results, dumpReader, SystemConstants.SYSTEM_REPO_ID, currentSystemSettings, null, | ||
| AttachedBinaries.empty() ); | ||
| // Load system-repo first to be able to read repository settings and data | ||
| initAndLoad( includeVersions, results, dumpReader, SystemConstants.SYSTEM_REPO_ID, | ||
| repoSettings.get( SystemConstants.SYSTEM_REPO_ID ), null, AttachedBinaries.empty() ); | ||
|
|
||
| // Transient repositories are not part of the dump. Clean them up. | ||
| final RepositoryIds repositoryEntryIds = repositoryEntryService.findRepositoryEntryIds(); | ||
| for ( RepositoryId repositoryId : repositoryEntryIds ) | ||
| for ( RepositoryId repositoryId : repositoryEntryService.findRepositoryEntryIds() ) | ||
| { | ||
| if ( repositoryEntryService.getRepositoryEntry( repositoryId ).isTransient() ) | ||
| { | ||
| repositoryEntryService.deleteRepositoryEntry( repositoryId ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Load other system repositories (auditlog, scheduler, app) | ||
| SYSTEM_REPO_IDS.stream().filter( repositoriesToLoad::contains ).forEach( repositoryId -> { | ||
| final RepositorySettings settings = repoSettings.getOrDefault( repositoryId, RepositorySettings.create().build() ); | ||
| if ( dumpRepositories.contains( repositoryId ) ) | ||
| { | ||
| initAndLoad( includeVersions, results, dumpReader, repositoryId, settings, new PropertyTree(), AttachedBinaries.empty() ); | ||
| } | ||
| else if ( !isPartialLoad ) | ||
| { | ||
| // Full load: recreate missing system repos with current settings | ||
| initializeRepo( repositoryId, settings, null, AttachedBinaries.empty() ); | ||
| createRootNode( repositoryId ); | ||
| } | ||
| } ); | ||
|
|
||
| // Load non-system repositories | ||
| repositoriesToLoad.stream() | ||
| .filter( Predicate.isEqual( SystemConstants.SYSTEM_REPO_ID ).or( SYSTEM_REPO_IDS::contains ).negate() ) | ||
| .forEach( repositoryId -> { | ||
| final RepositorySettings settings = repoSettings.getOrDefault( repositoryId, RepositorySettings.create().build() ); | ||
|
|
||
| // Load other system repositories | ||
| SYSTEM_REPO_IDS.forEach( repositoryId -> { | ||
| if ( dumpRepositories.contains( repositoryId ) ) | ||
| if ( isPartialLoad ) | ||
| { | ||
| // Dump contains repository. Do a normal load. | ||
| initAndLoad( includeVersions, results, dumpReader, repositoryId, repoSettings.get( repositoryId ), new PropertyTree(), | ||
| AttachedBinaries.empty() ); | ||
| // Partial load: get data and attachments from dump's system-repo | ||
| final RepositoryEntry dumpRepoEntry = dumpReader.getRepositoryEntry( repositoryId ); | ||
| final PropertyTree data = dumpRepoEntry != null ? dumpRepoEntry.getData() : null; | ||
| final AttachedBinaries attachments = dumpRepoEntry != null ? dumpRepoEntry.getAttachments() : AttachedBinaries.empty(); | ||
| initAndLoad( includeVersions, results, dumpReader, repositoryId, settings, data, attachments ); | ||
| } | ||
| else | ||
| { | ||
| // If it is an old dump it does not contain repo. It should be recreated with current settings | ||
| initializeRepo( repositoryId, repoSettings.get( repositoryId ), null, AttachedBinaries.empty() ); | ||
| createRootNode( repositoryId ); | ||
| // Full load: get data and attachments from loaded system-repo | ||
| final RepositoryEntry repository = repositoryEntryService.getRepositoryEntry( repositoryId ); | ||
| initAndLoad( includeVersions, results, dumpReader, repositoryId, repository.getSettings(), repository.getData(), | ||
| repository.getAttachments() ); | ||
| } | ||
|
|
||
| } ); | ||
|
|
||
| // Load non-system repositories | ||
| dumpRepositories. | ||
| stream(). | ||
| filter( Predicate.isEqual( SystemConstants.SYSTEM_REPO_ID ). | ||
| or( SYSTEM_REPO_IDS::contains ). | ||
| negate() ). | ||
| forEach( repositoryId -> { | ||
| final RepositoryEntry repository = repositoryEntryService.getRepositoryEntry( repositoryId ); | ||
| final RepositorySettings settings = repository.getSettings(); | ||
| final PropertyTree data = repository.getData(); | ||
| final AttachedBinaries attachedBinaries = repository.getAttachments(); | ||
| initAndLoad( includeVersions, results, dumpReader, repositoryId, settings, data, attachedBinaries ); | ||
| } ); | ||
|
|
||
| this.eventPublisher.publish( RepositoryEvents.restored() ); | ||
| LOG.info( "Dump Load completed" ); | ||
| } | ||
| catch ( IOException e ) | ||
| { | ||
| throw new UncheckedIOException( e ); | ||
| } | ||
| return results.build(); | ||
| } | ||
|
|
||
| void verifyOrUpdateDumpVersion( final Path basePath, final SystemLoadParams params, final DumpReader dumpReader ) | ||
|
|
||
This file contains hidden or 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 hidden or 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
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.
Codacy found an issue: The method 'doLoad(SystemLoadParams, SystemLoadResult.Builder, DumpReader, RepositoryIds, RepositoryIds)' has an NPath complexity of 240, current threshold is 200