Skip to content

HDDS-15301. Malformed PutBlock request can mark container UNHEALTHY #10295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peterxcli wants to merge 2 commits into
base: master
Choose a base branch
from
Open

HDDS-15301. Malformed PutBlock request can mark container UNHEALTHY #10295

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d805da
handle client malformed container write request
peterxcli May 17, 2026
1fbd29e
fix test
peterxcli May 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...r-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ private boolean canIgnoreException(Result result) {
case CLOSED_CONTAINER_IO:
case DELETE_ON_OPEN_CONTAINER:
case UNSUPPORTED_REQUEST:// Blame client for sending unsupported request.
case MALFORMED_REQUEST:// Blame client for sending malformed request.
case CONTAINER_MISSING:
case CONTAINER_ALREADY_EXISTS:
return true;
Expand Down
6 changes: 6 additions & 0 deletions ...ner-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.INVALID_ARGUMENT;
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.INVALID_CONTAINER_STATE;
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.IO_EXCEPTION;
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.MALFORMED_REQUEST;
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.PUT_SMALL_FILE_ERROR;
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.UNCLOSED_CONTAINER_IO;
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.UNSUPPORTED_REQUEST;
Expand Down Expand Up @@ -123,6 +124,7 @@
import org.apache.hadoop.hdds.upgrade.HDDSLayoutFeature;
import org.apache.hadoop.hdds.utils.FaultInjector;
import org.apache.hadoop.hdds.utils.HddsServerUtil;
import org.apache.hadoop.hdds.utils.db.CodecException;
import org.apache.hadoop.hdds.utils.io.RandomAccessFileChannel;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.OzoneConsts;
Expand Down Expand Up @@ -685,6 +687,10 @@ ContainerCommandResponseProto handlePutBlock(
metrics.incContainerBytesStats(Type.PutBlock, numBytes);
} catch (StorageContainerException ex) {
return ContainerUtils.logAndReturnError(LOG, ex, request);
} catch (CodecException ex) {
return ContainerUtils.logAndReturnError(LOG,
new StorageContainerException("Malformed PutBlock request", ex,
MALFORMED_REQUEST), request);
} catch (IOException ex) {
return ContainerUtils.logAndReturnError(LOG,
new StorageContainerException("Put Key failed", ex, IO_EXCEPTION),
Expand Down
42 changes: 42 additions & 0 deletions ...rvice/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,48 @@ public void testCreateContainerWhenAlreadyExistsDoesNotMarkUnhealthy() throws IO
}
}

@Test
public void testMalformedPutBlockDoesNotMarkContainerUnhealthy() throws IOException {
String testDirPath = testDir.getPath();
try {
UUID scmId = UUID.randomUUID();
OzoneConfiguration conf = new OzoneConfiguration();
conf.set(HDDS_DATANODE_DIR_KEY, testDirPath);
conf.set(OzoneConfigKeys.OZONE_METADATA_DIRS, testDirPath);
DatanodeDetails dd = randomDatanodeDetails();
HddsDispatcher hddsDispatcher = createDispatcher(dd, scmId, conf);

ContainerCommandRequestProto writeChunkRequest =
getWriteChunkRequest(dd.getUuidString(), 1L, 1L);
ContainerCommandResponseProto writeChunkResponse =
hddsDispatcher.dispatch(writeChunkRequest, null);
assertEquals(ContainerProtos.Result.SUCCESS, writeChunkResponse.getResult());

ContainerCommandRequestProto putBlockRequest =
ContainerTestHelper.getPutBlockRequest(writeChunkRequest);
ContainerProtos.BlockData malformedBlockData =
putBlockRequest.getPutBlock().getBlockData().toBuilder()
.setSize(putBlockRequest.getPutBlock().getBlockData().getSize() + 1)
.build();
ContainerCommandRequestProto malformedPutBlockRequest =
putBlockRequest.toBuilder()
.setPutBlock(putBlockRequest.getPutBlock().toBuilder()
.setBlockData(malformedBlockData))
.build();

ContainerCommandResponseProto response =
hddsDispatcher.dispatch(malformedPutBlockRequest, null);
assertEquals(ContainerProtos.Result.MALFORMED_REQUEST, response.getResult());

Container container = hddsDispatcher.getContainer(1L);
assertNotNull(container);
assertTrue(container.getContainerData().isOpen());
assertFalse(container.getContainerData().isUnhealthy());
} finally {
ContainerMetrics.remove();
}
}

@Test
public void testDuplicateWriteChunkAndPutBlockRequest() throws IOException {
String testDirPath = testDir.getPath();
Expand Down
Loading