This is an automated email from the ASF dual-hosted git repository.
sodonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 151ee0afd8 HDDS-7820. Store container descriptor at start of tar
archive (#4200)
151ee0afd8 is described below
commit 151ee0afd86517969b9f8382fd7eb027f7ca3e88
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Jan 24 12:35:42 2023 +0100
HDDS-7820. Store container descriptor at start of tar archive (#4200)
---
.../hadoop/ozone/container/keyvalue/TarContainerPacker.java | 9 +++++----
.../ozone/container/keyvalue/TestTarContainerPacker.java | 10 +++++++---
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/TarContainerPacker.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/TarContainerPacker.java
index 40d1c1676a..f5763958a1 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/TarContainerPacker.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/TarContainerPacker.java
@@ -67,7 +67,7 @@ public class TarContainerPacker
static final String DB_DIR_NAME = "db";
- private static final String CONTAINER_FILE_NAME = "container.yaml";
+ static final String CONTAINER_FILE_NAME = "container.yaml";
private final String compression;
@@ -167,13 +167,13 @@ public class TarContainerPacker
KeyValueContainerData containerData = container.getContainerData();
try (ArchiveOutputStream archiveOutput = tar(compress(output))) {
- includePath(getDbPath(containerData), DB_DIR_NAME,
+ includeFile(container.getContainerFile(), CONTAINER_FILE_NAME,
archiveOutput);
- includePath(Paths.get(containerData.getChunksPath()), CHUNKS_DIR_NAME,
+ includePath(getDbPath(containerData), DB_DIR_NAME,
archiveOutput);
- includeFile(container.getContainerFile(), CONTAINER_FILE_NAME,
+ includePath(Paths.get(containerData.getChunksPath()), CHUNKS_DIR_NAME,
archiveOutput);
} catch (CompressorException e) {
throw new IOException(
@@ -263,6 +263,7 @@ public class TarContainerPacker
// empty.
ArchiveEntry entry = archiveOutput.createArchiveEntry(dir.toFile(),
subdir);
archiveOutput.putArchiveEntry(entry);
+ archiveOutput.closeArchiveEntry();
// Add files in the directory.
try (Stream<Path> dirEntries = Files.list(dir)) {
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestTarContainerPacker.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestTarContainerPacker.java
index 73df8f2964..61110023e2 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestTarContainerPacker.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestTarContainerPacker.java
@@ -59,6 +59,7 @@ import org.junit.runners.Parameterized;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.nio.file.Files.newInputStream;
import static java.nio.file.Files.newOutputStream;
+import static
org.apache.hadoop.ozone.container.keyvalue.TarContainerPacker.CONTAINER_FILE_NAME;
/**
* Test the tar/untar for a given container.
@@ -199,15 +200,18 @@ public class TestTarContainerPacker {
InputStream uncompressed = packer.decompress(input);
tarStream = new TarArchiveInputStream(uncompressed);
+ boolean first = true;
TarArchiveEntry entry;
Map<String, TarArchiveEntry> entries = new HashMap<>();
while ((entry = tarStream.getNextTarEntry()) != null) {
+ if (first) {
+ Assert.assertEquals(CONTAINER_FILE_NAME, entry.getName());
+ first = false;
+ }
entries.put(entry.getName(), entry);
}
- Assert.assertTrue(
- entries.containsKey("container.yaml"));
-
+ Assert.assertTrue(entries.containsKey(CONTAINER_FILE_NAME));
} finally {
if (tarStream != null) {
tarStream.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
