xichen01 commented on code in PR #11223:
URL: https://github.com/apache/ozone/pull/11223#discussion_r4048765537
##########
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java:
##########
@@ -194,6 +195,12 @@ public void buildMissingContainerSetAndValidate(
@Override
public ContainerCommandResponseProto dispatch(
ContainerCommandRequestProto msg, DispatcherContext dispatcherContext) {
+ try {
+ HddsUtils.getBlockID(msg);
+ } catch (IllegalArgumentException e) {
+ return ContainerUtils.logAndReturnError(LOG,
+ new StorageContainerException(e.getMessage(), e,
Result.INVALID_ARGUMENT), msg);
+ }
Review Comment:
This is to prevent an invalid storage type from causing other exceptions
later on, I've moved this code block into a more readable method
##########
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java:
##########
@@ -636,6 +636,7 @@ public static PutSmallFileResponseProto writeSmallFile(
public static void createRecoveringContainer(XceiverClientSpi client,
long containerID, String encodedToken, int replicaIndex)
throws IOException {
+ // TODO StoragePolicy Support EC
Review Comment:
updated
##########
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/BlockID.java:
##########
@@ -147,12 +174,13 @@ public boolean equals(Object o) {
BlockID blockID = (BlockID) o;
return this.getContainerBlockID().equals(blockID.getContainerBlockID())
&& this.getBlockCommitSequenceId() ==
blockID.getBlockCommitSequenceId()
- && Objects.equals(this.getReplicaIndex(), blockID.getReplicaIndex());
+ && Objects.equals(this.getReplicaIndex(), blockID.getReplicaIndex())
+ && Objects.equals(this.getStorageType(), blockID.getStorageType());
}
@Override
public int hashCode() {
return Objects.hash(containerBlockID.getContainerID(),
containerBlockID.getLocalID(),
- blockCommitSequenceId, replicaIndex);
+ blockCommitSequenceId, replicaIndex, storageType);
Review Comment:
removed
##########
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/BlockID.java:
##########
@@ -147,12 +174,13 @@ public boolean equals(Object o) {
BlockID blockID = (BlockID) o;
return this.getContainerBlockID().equals(blockID.getContainerBlockID())
&& this.getBlockCommitSequenceId() ==
blockID.getBlockCommitSequenceId()
- && Objects.equals(this.getReplicaIndex(), blockID.getReplicaIndex());
+ && Objects.equals(this.getReplicaIndex(), blockID.getReplicaIndex())
+ && Objects.equals(this.getStorageType(), blockID.getStorageType());
Review Comment:
removed
--
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]
