Skip to content

[GOBBLIN-1973] Change Manifest distcp logic to compare permissions of source and dest files even when source is older #3845

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

Merged
Will-Lo merged 4 commits into from
Dec 14, 2023
Merged

[GOBBLIN-1973] Change Manifest distcp logic to compare permissions of source and dest files even when source is older #3845

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91c3560
change should copy logic
Will-Lo Dec 12, 2023
cb8141f
Add tests, address review
Will-Lo Dec 13, 2023
8a32157
Fix checkstyle
Will-Lo Dec 14, 2023
9fe12f3
Remove unused imports
Will-Lo Dec 14, 2023
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
7 changes: 4 additions & 3 deletions ...anagement/src/main/java/org/apache/gobblin/data/management/copy/ManifestBasedDataset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,11 @@ public Iterator<FileSet<CopyEntity>> getFileSetIterator(FileSystem targetFs, Cop

private static boolean shouldCopy(FileSystem targetFs, FileStatus fileInSource, FileStatus fileInTarget, OwnerAndPermission replicatedPermission)
throws IOException {
if (fileInSource.isDirectory() || fileInSource.getModificationTime() == fileInTarget.getModificationTime()) {
// if source is dir or source and dst has same version, we compare the permission to determine whether it needs another sync
if (fileInSource.isDirectory() || fileInSource.getModificationTime() <= fileInTarget.getModificationTime()) {
// even if destination has a newer version than the source, we still copy the file if the owner or permission is different
return !replicatedPermission.hasSameOwnerAndPermission(targetFs, fileInTarget);
}
return fileInSource.getModificationTime() > fileInTarget.getModificationTime();
// Source is newer than the target, must copy
return true;

@phet phet Dec 12, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would this be equivalent:

return fileInSrc.modT() > fileInTarg.modT()
    || !replicatedPermission.hasSameOwnerAndPerms(targFs, fileInTarget);

?

}
}