You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ae...@apache.org on 2018/01/18 18:19:09 UTC
hadoop git commit: HDFS-13026. Ozone: TestContainerPersistence is
failing becaue of container data mismatch. Contributed by Mukul Kumar Singh.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 32476cd8f -> 87bce6e8e
HDFS-13026. Ozone: TestContainerPersistence is failing becaue of container data mismatch. Contributed by Mukul Kumar Singh.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/87bce6e8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/87bce6e8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/87bce6e8
Branch: refs/heads/HDFS-7240
Commit: 87bce6e8e7569faab46b97c78898379530297bd5
Parents: 32476cd
Author: Anu Engineer <ae...@apache.org>
Authored: Thu Jan 18 09:51:27 2018 -0800
Committer: Anu Engineer <ae...@apache.org>
Committed: Thu Jan 18 09:51:27 2018 -0800
----------------------------------------------------------------------
.../ozone/container/common/impl/ChunkManagerImpl.java | 9 +++++++--
.../container/common/impl/TestContainerPersistence.java | 4 ++--
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/87bce6e8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ChunkManagerImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ChunkManagerImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ChunkManagerImpl.java
index 4aa667e..9052df7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ChunkManagerImpl.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ChunkManagerImpl.java
@@ -98,8 +98,13 @@ public class ChunkManagerImpl implements ChunkManager {
commitChunk(tmpChunkFile, chunkFile, containerName, info.getLen());
break;
case COMBINED:
- ChunkUtils.writeData(tmpChunkFile, info, data);
- commitChunk(tmpChunkFile, chunkFile, containerName, info.getLen());
+ // directly write to the chunk file
+ long oldSize = chunkFile.length();
+ ChunkUtils.writeData(chunkFile, info, data);
+ long newSize = chunkFile.length();
+ containerManager.incrBytesUsed(containerName, newSize - oldSize);
+ containerManager.incrWriteCount(containerName);
+ containerManager.incrWriteBytes(containerName, info.getLen());
break;
}
} catch (ExecutionException | NoSuchAlgorithmException | IOException e) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/87bce6e8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
index 1ec754d..6902890 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
@@ -531,8 +531,8 @@ public class TestContainerPersistence {
try {
chunkManager.writeChunk(pipeline, keyName, info, data, COMBINED);
} catch (IOException ex) {
- Assert.assertTrue(ex.getMessage().contains(
- "Rejecting write chunk request. OverWrite flag required."));
+ Assert.assertTrue(ex.getCause().getMessage().contains(
+ "Rejecting write chunk request. OverWrite flag required"));
}
// With the overwrite flag it should work now.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org