Skip to content

HDDS-8385. Ozone can't process snapshot when service UID > 2097151. #4580

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
kaijchen merged 2 commits into from
Apr 19, 2023
Merged

HDDS-8385. Ozone can't process snapshot when service UID > 2097151. #4580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f066098
Set tar big number mode
Apr 17, 2023
9180c7b
added setBigNumberMode() to all TarArchiveOutputStream's
Apr 18, 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
4 changes: 3 additions & 1 deletion ...-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/TarContainerPacker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,9 @@ private static ArchiveInputStream untar(InputStream input) {
}

private static ArchiveOutputStream tar(OutputStream output) {
return new TarArchiveOutputStream(output);
TarArchiveOutputStream os = new TarArchiveOutputStream(output);
os.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
return os;
}

@VisibleForTesting
Expand Down
5 changes: 3 additions & 2 deletions ...vice/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestTarContainerPacker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;

import org.apache.commons.compress.archivers.ArchiveOutputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
Expand Down Expand Up @@ -381,7 +380,9 @@ private File packContainerWithSingleFile(File file, String entryName)
File targetFile = TEMP_DIR.resolve("container.tar").toFile();
try (FileOutputStream output = new FileOutputStream(targetFile);
OutputStream compressed = packer.compress(output);
ArchiveOutputStream archive = new TarArchiveOutputStream(compressed)) {
TarArchiveOutputStream archive =
new TarArchiveOutputStream(compressed)) {
archive.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
TarContainerPacker.includeFile(file, entryName, archive);
}
return targetFile;
Expand Down
4 changes: 3 additions & 1 deletion hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,10 +532,12 @@ public static MetricsSystem initializeMetrics(
public static void writeDBCheckpointToStream(DBCheckpoint checkpoint,
OutputStream destination)
throws IOException {
try (ArchiveOutputStream archiveOutputStream =
try (TarArchiveOutputStream archiveOutputStream =
new TarArchiveOutputStream(destination);
Stream<Path> files =
Files.list(checkpoint.getCheckpointLocation())) {
archiveOutputStream.setBigNumberMode(
TarArchiveOutputStream.BIGNUMBER_POSIX);
for (Path path : files.collect(Collectors.toList())) {
if (path != null) {
Path fileName = path.getFileName();
Expand Down
2 changes: 2 additions & 0 deletions ...p-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ public void writeDbDataToStream(DBCheckpoint checkpoint,
new TarArchiveOutputStream(destination)) {
archiveOutputStream
.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
archiveOutputStream
.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
writeFilesToArchive(copyFiles, hardLinkFiles, archiveOutputStream);
}
}
Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public static File createTarFile(Path sourcePath) throws IOException {
String fileName = sourceDir.concat(".tar");
fileOutputStream = new FileOutputStream(fileName);
tarOs = new TarArchiveOutputStream(fileOutputStream);
tarOs.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
File folder = new File(sourceDir);
File[] filesInDir = folder.listFiles();
if (filesInDir != null) {
Expand Down