Skip to content

HDDS-8371. Avoid concatenating unexpected a full path and prefix #4530

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

Closed
k5342 wants to merge 1 commit into from
Closed

HDDS-8371. Avoid concatenating unexpected a full path and prefix #4530

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1896,9 +1896,8 @@ public List<OmKeyInfo> getPendingDeletionSubFiles(long volumeId,
parentInfo.getObjectID())) {
break;
}
fileInfo.setFileName(fileInfo.getKeyName());
String fullKeyPath = OMFileRequest.getAbsolutePath(
parentInfo.getKeyName(), fileInfo.getKeyName());
parentInfo.getKeyName(), fileInfo.getFileName());
fileInfo.setKeyName(fullKeyPath);

files.add(fileInfo);
Expand Down
3 changes: 1 addition & 2 deletions ...p-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneListStatusHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,8 @@ public OzoneFileStatus getStatus(String prefixPath, long scmBlockSize,
} else {
Preconditions.checkArgument(value instanceof OmKeyInfo);
keyInfo = (OmKeyInfo) value;
keyInfo.setFileName(keyInfo.getKeyName());
String fullKeyPath = OMFileRequest.getAbsolutePath(prefixPath,
keyInfo.getKeyName());
keyInfo.getFileName());
Copy link
Contributor

@ashishkumar50 ashishkumar50 Apr 10, 2023

Choose a reason for hiding this comment

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

Instead of doing this, I think it's better to have tool which should correct metadata. This will just avoid one problem but metadata will remain in corrupt state.

Copy link
Contributor

@ashishkumar50 ashishkumar50 Apr 11, 2023

Choose a reason for hiding this comment

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

You can refer tools like #4337.

keyInfo.setKeyName(fullKeyPath);
}
return new OzoneFileStatus(keyInfo, scmBlockSize, entryType.isDir());
Expand Down