HDDS-12778. Change ordering of transfer in OM bootstrap process. #8245
Conversation
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
hemantk-12
reviewed
Apr 22, 2025
There was a problem hiding this comment.
Thanks, @sadanand48 for the improvement. It will reduce unnecessary memtable flush and checkpoint creation for tarball.
What type of testing are we doing for it? Also, can you fix the test cases?
| if (!processDir(dir, copyFiles, hardLinkFiles, sstFilesToExclude, | ||
| new HashSet<>(), excluded, copySize, null)) { | ||
| return false; | ||
| } | ||
|
|
There was a problem hiding this comment.
nit: remove this extra line.
Comment on lines
+314
to
+318
| if (LOG.isDebugEnabled()) { | ||
| if (processedSnapshotData) { | ||
| LOG.debug("Finished processing OM snapshot data"); | ||
| } | ||
| } |
There was a problem hiding this comment.
nit: there is no need to do LOG.isDebugEnabled() check for a simple string. It is useful when String concatenation is needed.
Suggested change
| if (LOG.isDebugEnabled()) { | |
| if (processedSnapshotData) { | |
| LOG.debug("Finished processing OM snapshot data"); | |
| } | |
| } | |
| if (processedSnapshotData) { | |
| LOG.debug("Finished processing OM snapshot data"); | |
| } |
Alternatively
if (LOG.isDebugEnabled() && processedSnapshotData) {
LOG.debug("Finished processing OM snapshot data");
}
| boolean processedTmpSstCompactionDir = processDir(sstBackupDir.getTmpDir().toPath(), | ||
| copyFiles, hardLinkFiles, sstFilesToExclude, new HashSet<>(), | ||
| excluded, copySize, sstBackupDir.getOriginalDir().toPath()); | ||
| if (LOG.isDebugEnabled()) { |
Comment on lines
+324
to
+326
| boolean processedTmpSstCompactionDir = processDir(sstBackupDir.getTmpDir().toPath(), | ||
| copyFiles, hardLinkFiles, sstFilesToExclude, new HashSet<>(), | ||
| excluded, copySize, sstBackupDir.getOriginalDir().toPath()); |
There was a problem hiding this comment.
Suggested change
| boolean processedTmpSstCompactionDir = processDir(sstBackupDir.getTmpDir().toPath(), | |
| copyFiles, hardLinkFiles, sstFilesToExclude, new HashSet<>(), | |
| excluded, copySize, sstBackupDir.getOriginalDir().toPath()); | |
| boolean processedSstCompactionBackupDir = processDir(sstBackupDir.getTmpDir().toPath(), | |
| copyFiles, hardLinkFiles, sstFilesToExclude, new HashSet<>(), | |
| excluded, copySize, sstBackupDir.getOriginalDir().toPath()); |
Comment on lines
+337
to
+339
| boolean processedTmpCompactionLogDir = processDir(compactionLogDir.getTmpDir().toPath(), | ||
| copyFiles, hardLinkFiles, sstFilesToExclude, new HashSet<>(), | ||
| excluded, copySize, compactionLogDir.getOriginalDir().toPath()); |
There was a problem hiding this comment.
nit: let's just call it processedCompactionLogDir. We create tmp for local referencing only.
Suggested change
| boolean processedTmpCompactionLogDir = processDir(compactionLogDir.getTmpDir().toPath(), | |
| copyFiles, hardLinkFiles, sstFilesToExclude, new HashSet<>(), | |
| excluded, copySize, compactionLogDir.getOriginalDir().toPath()); | |
| boolean processedCompactionLogDir = processDir(compactionLogDir.getTmpDir().toPath(), | |
| copyFiles, hardLinkFiles, sstFilesToExclude, new HashSet<>(), | |
| excluded, copySize, compactionLogDir.getOriginalDir().toPath()); |
| @@ -380,18 +408,24 @@ private Set<Path> getSnapshotDirs(DBCheckpoint checkpoint, boolean waitForDir) | |||
| iterator = checkpointMetadataManager | |||
| .getSnapshotInfoTable().iterator()) { | |||
|
|
|||
| // For each entry, wait for corresponding directory. | |||
| // For each entry, wait for corresponding directory if the key is | |||
There was a problem hiding this comment.
Are we assuming that whatever is flushed to disk must have a snapshot directory?
added 2 commits
April 23, 2025 09:50
jojochuang
reviewed
May 7, 2025
| @@ -114,10 +114,17 @@ public static void createHardLinks(Path dbPath) throws IOException { | |||
|
|
|||
| // Create a link for each line. | |||
| for (String l : lines) { | |||
| String from = l.split("\t")[1]; | |||
| String to = l.split("\t")[0]; | |||
| String[] parts = l.split("\t"); | |||
There was a problem hiding this comment.
is there test code added for the new change in createHardLinks?
| omCheckpointUrl + ". ErrorCode: " + errorCode); | ||
| omCheckpointUrl + ". ErrorCode: " + errorCode; | ||
| LOG.error(message); | ||
| throw new IOException(message); |
There was a problem hiding this comment.
- connection object should call disconnect() before throwing the exception.
- This is unrelated, but the caller of this method, RDBSnapProvider.downloadDBSnapshotFromLeader() does not retry on exception. Should an exception be retried?
| * @param lines Text lines defining the link paths. | ||
| * @param testDirName Name of test directory. | ||
| */ | ||
| private void checkFabricatedLines(Set<String> directories, List<String> lines, |
There was a problem hiding this comment.
removed because the usage is removed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What changes were proposed in this pull request?
The following changes are done:
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-12778