siddhantsangwan commented on code in PR #8228:
URL: https://github.com/apache/ozone/pull/8228#discussion_r2030501768
##########
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java:
##########
@@ -627,13 +627,160 @@ public void testWriteChunk(ContainerTestVersionInfo
versionInfo)
}
/**
- * Writes many chunks of the same block into different chunk files and
- * verifies that we have that data in many files.
+ * Tests that committed space is correctly decremented when a write fits
entirely within the available space under
+ * max container size. It should be decremented by the number of bytes
written.
*
- * @throws IOException
- * @throws NoSuchAlgorithmException
+ * Before write: Container size is less than max size
+ * After write: Container size is still less than max size
+ */
+ @ContainerTestVersionInfo.ContainerTest
+ public void
testIncrWriteBytesDecrementsCommittedWhenWriteFits(ContainerTestVersionInfo
versionInfo)
+ throws IOException {
+ initSchemaAndVersionInfo(versionInfo);
+ BlockID blockID = ContainerTestHelper.
+ getTestBlockID(getTestContainerID());
+ long testContainerID = blockID.getContainerID();
+ Container container = containerSet.getContainer(testContainerID);
+ if (container == null) {
+ container = addContainer(containerSet, testContainerID);
+ }
+
+ long commitBytesBefore =
container.getContainerData().getVolume().getCommittedBytes();
+ long writeBytes = 256 * OzoneConsts.MB;
+ container.getContainerData().updateWriteStats(writeBytes, false);
+ long commitBytesAfter =
container.getContainerData().getVolume().getCommittedBytes();
+ long commitDecrement = commitBytesBefore - commitBytesAfter;
+ // did we decrement commit bytes by the amount of data we wrote?
+ assertEquals(writeBytes, commitDecrement);
+ }
+
+ /**
+ * Tests the scenario where a write operation causes the container usage to
exceed max container size.
+ * The committed space should only be decremented by the amount of the write
that fit within the max limit.
+ *
+ * Before Write: Container size is within max size
+ * After Write: Container size exceeds max size
+ */
+ @ContainerTestVersionInfo.ContainerTest
+ public void
testIncrWriteBytesDecrementsCommittedCorrectlyWhenWriteExceedsMax(ContainerTestVersionInfo
versionInfo)
+ throws IOException {
+ initSchemaAndVersionInfo(versionInfo);
+ BlockID blockID = ContainerTestHelper.
+ getTestBlockID(getTestContainerID());
+ long testContainerID = blockID.getContainerID();
+ Container container = containerSet.getContainer(testContainerID);
+ if (container == null) {
+ container = addContainer(containerSet, testContainerID);
+ }
+
+ // fill the container close to the max size first
+ long writeBytes = container.getContainerData().getMaxSize() - 100;
+ container.getContainerData().updateWriteStats(writeBytes, false);
+
+ // the next write will make the container size exceed max size
+ long commitBytesBefore =
container.getContainerData().getVolume().getCommittedBytes();
+ writeBytes = 256 * OzoneConsts.MB;
+ container.getContainerData().updateWriteStats(writeBytes, false);
+ long commitBytesAfter =
container.getContainerData().getVolume().getCommittedBytes();
+ long commitDecrement = commitBytesBefore - commitBytesAfter;
+ // did we decrement commit bytes by the amount that was remaining, ie, 100
bytes?
+ assertEquals(100, commitDecrement);
+ }
+
+ /**
+ * Tests that committed space is not decremented if the container was already
+ * full (or overfull) before the write operation.
+ */
+ @ContainerTestVersionInfo.ContainerTest
+ public void
testIncrWriteBytesDoesNotDecrementCommittedWhenContainerFull(ContainerTestVersionInfo
versionInfo)
+ throws IOException {
+ initSchemaAndVersionInfo(versionInfo);
+ BlockID blockID = ContainerTestHelper.
+ getTestBlockID(getTestContainerID());
+ long testContainerID = blockID.getContainerID();
+ Container container = containerSet.getContainer(testContainerID);
+ if (container == null) {
+ container = addContainer(containerSet, testContainerID);
+ }
+
+ // fill the container completely first
+ long writeBytes = container.getContainerData().getMaxSize();
+ container.getContainerData().updateWriteStats(writeBytes, false);
+
+ // the next write will make the container size exceed max size
+ long commitBytesBefore =
container.getContainerData().getVolume().getCommittedBytes();
+ writeBytes = 256 * OzoneConsts.MB;
+ container.getContainerData().updateWriteStats(writeBytes, false);
+ long commitBytesAfter =
container.getContainerData().getVolume().getCommittedBytes();
+ long commitDecrement = commitBytesBefore - commitBytesAfter;
+ // decrement should be 0, as the container was already full before the
write
+ assertEquals(0, commitDecrement);
+ }
+
+ /**
+ * In this test, the write fills the container exactly to max size.
Committed space should be decremented by the
+ * amount of bytes written.
*/
@ContainerTestVersionInfo.ContainerTest
+ public void
testIncrWriteBytesDecrementsCommittedCorrectlyWhenWrittenToBrim(ContainerTestVersionInfo
versionInfo)
+ throws IOException {
+ initSchemaAndVersionInfo(versionInfo);
+ BlockID blockID = ContainerTestHelper.
+ getTestBlockID(getTestContainerID());
+ long testContainerID = blockID.getContainerID();
+ Container container = containerSet.getContainer(testContainerID);
+ if (container == null) {
+ container = addContainer(containerSet, testContainerID);
+ }
+
+ // fill the container completely first
+ long writeBytes = container.getContainerData().getMaxSize() - 256 *
OzoneConsts.MB;
+ container.getContainerData().updateWriteStats(writeBytes, false);
+
+ // the next write will make the container size exactly equal to max size
+ long commitBytesBefore =
container.getContainerData().getVolume().getCommittedBytes();
+ writeBytes = 256 * OzoneConsts.MB;
Review Comment:
After the write at line 737, only 256MB is remaining out of 1GB.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
