big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-13026. Ozone: TestContainerPersistence is failing becaue of container data mismatch. Contributed by Mukul Kumar Singh.

Browse Source
This commit is contained in:
Anu Engineer 2018-01-18 09:51:27 -08:00 committed by Owen O'Malley
parent 28b87af51b
commit 916f31f7d1
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ChunkManagerImpl.java
View File

@ -98,8 +98,13 @@ public class ChunkManagerImpl implements ChunkManager {
commitChunk(tmpChunkFile, chunkFile, containerName, info.getLen()); commitChunk(tmpChunkFile, chunkFile, containerName, info.getLen());
break; break;
case COMBINED: case COMBINED:
ChunkUtils.writeData(tmpChunkFile, info, data); // directly write to the chunk file
commitChunk(tmpChunkFile, chunkFile, containerName, info.getLen()); 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; break;
} }
} catch (ExecutionException | NoSuchAlgorithmException | IOException e) { } catch (ExecutionException | NoSuchAlgorithmException | IOException e) {

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
View File

@ -531,8 +531,8 @@ public class TestContainerPersistence {
try { try {
chunkManager.writeChunk(pipeline, keyName, info, data, COMBINED); chunkManager.writeChunk(pipeline, keyName, info, data, COMBINED);
} catch (IOException ex) { } catch (IOException ex) {
Assert.assertTrue(ex.getMessage().contains( Assert.assertTrue(ex.getCause().getMessage().contains(
"Rejecting write chunk request. OverWrite flag required.")); "Rejecting write chunk request. OverWrite flag required"));
} }
// With the overwrite flag it should work now. // With the overwrite flag it should work now.