Skip to content

[7.x.x] Fix restore progress stopping at 94.1% by not counting descriptors twice #249

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

Open
Laurettta wants to merge 1 commit into
base: develop-7.x.x
Choose a base branch
from
Open

[7.x.x] Fix restore progress stopping at 94.1% by not counting descriptors twice #249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions exist-core/src/main/java/org/exist/backup/Restore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public void restore(final DBBroker broker, @Nullable final Txn transaction, fina
// count all files
long totalNrOfFiles = 0;
for (BackupDescriptor backupDescriptor : descriptors) {
if (!isInsideAnotherDescriptor(backupDescriptor, descriptors))
totalNrOfFiles += backupDescriptor.getNumberOfFiles();
}

Expand Down Expand Up @@ -131,6 +132,23 @@ public void restore(final DBBroker broker, @Nullable final Txn transaction, fina
}
}
}

private boolean isInsideAnotherDescriptor(final BackupDescriptor descriptor, final Deque<BackupDescriptor> descriptors) {
final String pathToCheck = descriptor.getSymbolicPath();
for (final BackupDescriptor otherDescriptor : descriptors) {
if (otherDescriptor == (descriptor)) {
continue;
}
final String otherPathDescriptorPath = otherDescriptor.getSymbolicPath();
if(otherPathDescriptorPath.endsWith(BackupDescriptor.COLLECTION_DESCRIPTOR)) {
final String outerFolder = otherPathDescriptorPath.substring(0, otherPathDescriptorPath.length() - BackupDescriptor.COLLECTION_DESCRIPTOR.length());
if (pathToCheck.startsWith(outerFolder)) {
return true;
}
}
}
return false;
}

private Deque<BackupDescriptor> getBackupDescriptors(Path contents) throws IOException {
final Deque<BackupDescriptor> descriptors = new ArrayDeque<>();
Expand Down
Loading