You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by el...@apache.org on 2021/02/24 08:46:03 UTC
[ozone] 14/27: merge branch 'disable-replication-compression' into
dev
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch HDDS-3816-ec
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 3f25e01438da7456838fd22fc4ec54050659aeda
Merge: 4f145b8 09477f5
Author: Elek Márton <el...@apache.org>
AuthorDate: Fri Jan 29 10:29:16 2021 +0100
merge branch 'disable-replication-compression' into dev
.../container/keyvalue/TarContainerPacker.java | 35 +++-------------------
.../container/keyvalue/TestTarContainerPacker.java | 17 +++--------
2 files changed, 8 insertions(+), 44 deletions(-)
diff --cc hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/TarContainerPacker.java
index aaafed4,a3cb873..c745fdb9
--- 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
@@@ -143,8 -140,9 +137,7 @@@ public class TarContainerPacke
OutputStream output)
throws IOException {
- try (OutputStream compressed = compress(output);
- ArchiveOutputStream archiveOutput = tar(compressed)) {
- KeyValueContainerData containerData = container.getContainerData();
-
+ try (ArchiveOutputStream archiveOutput = tar(output)) {
includePath(containerData.getDbFile().toPath(), DB_DIR_NAME,
archiveOutput);
@@@ -152,13 -150,10 +145,10 @@@
includePath(Paths.get(containerData.getChunksPath()), CHUNKS_DIR_NAME,
archiveOutput);
- includeFile(container.getContainerFile(), CONTAINER_FILE_NAME,
+ includeFile(containerData.getContainerFile(), CONTAINER_FILE_NAME,
archiveOutput);
- } catch (CompressorException e) {
- throw new IOException(
- "Can't compress the container: " + containerData.getContainerID(),
- e);
}
+
}
@Override
@@@ -229,16 -218,16 +213,5 @@@
return new TarArchiveOutputStream(output);
}
-- private static InputStream decompress(InputStream input)
-- throws CompressorException {
-- return new CompressorStreamFactory()
-- .createCompressorInputStream(CompressorStreamFactory.GZIP, input);
-- }
--
-- private static OutputStream compress(OutputStream output)
-- throws CompressorException {
-- return new CompressorStreamFactory()
-- .createCompressorOutputStream(CompressorStreamFactory.GZIP, output);
-- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org