Skip to content

HDDS-4126. Freon key generator should support >2GB files. #3054

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
adoroszlai merged 4 commits into from
Feb 11, 2022
Merged

HDDS-4126. Freon key generator should support >2GB files. #3054

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b70576
HDDS-4126. Freon key generator should support >2g files.
Feb 8, 2022
183c014
HDDS-4126. Freon key generator should support >2g files.
Feb 9, 2022
5bf8de0
HDDS-4126. Freon key generator should support >2g files.
Feb 10, 2022
aa2606e
restore newline at EOF
adoroszlai Feb 10, 2022
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
2 changes: 1 addition & 1 deletion hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/HadoopDirTreeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public class HadoopDirTreeGenerator extends BaseFreonGenerator
"written in each directory. Full name --fileSize will be removed " +
"in later versions.",
defaultValue = "4096")
private int fileSizeInBytes;
private long fileSizeInBytes;

@Option(names = {"-b", "--buffer"},
description = "Size of buffer used to generated the file content.",
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/HadoopFsGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class HadoopFsGenerator extends BaseFreonGenerator
@Option(names = {"-s", "--size"},
description = "Size of the generated files (in bytes)",
defaultValue = "10240")
private int fileSize;
private long fileSize;

@Option(names = {"--buffer"},
description = "Size of buffer used store the generated key content",
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/StreamingGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class StreamingGenerator extends BaseFreonGenerator
@CommandLine.Option(names = {"--size"},
description = "Size of the generated files.",
defaultValue = "104857600")
private int fileSize;
private long fileSize;

private static final String SUB_DIR_NAME = "dir1";

Expand Down
4 changes: 2 additions & 2 deletions ...ols/src/main/java/org/apache/hadoop/ozone/freon/containergenerator/GeneratorDatanode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public void generateData(long index) throws Exception {
//loop to create multiple chunks per blocks
while (writtenBytes < getKeySize()) {
int currentChunkSize =
Math.min(getKeySize() - writtenBytes, chunkSize);
Math.min(getKeySize() - writtenBytes, chunkSize);

@adoroszlai adoroszlai Feb 9, 2022

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.

GeneratorDatanode only has whitespace change. Can you please omit it from the patch?

String chunkName = "chunk" + chunkIndex++;

final byte[] data = new byte[currentChunkSize];
Expand Down Expand Up @@ -366,4 +366,4 @@ private void writeChunk(
chunkManager.finishWriteChunks(container, new BlockData(blockId));
}

}
}