Skip to content
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

Jump to bottom

HDDS-7108. Include supported EC data-parity combinations in error message #3665

Merged
merged 14 commits into from
Aug 19, 2022
Merged

HDDS-7108. Include supported EC data-parity combinations in error message #3665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f682f66
Fix error message on console output when incorrect replication config…
Aug 8, 2022
2fba497
fix code style
Aug 8, 2022
84d8be1
update regex pattern of ec replication
Aug 8, 2022
817aba9
update regex pattern of ec replication
Aug 8, 2022
786cae3
update regex pattern of ec replication
Aug 8, 2022
a4d656a
update regex pattern of ec replication
Aug 8, 2022
f34271e
update EC data-parity error message
Aug 8, 2022
345608f
update EC data-parity error message
Aug 9, 2022
971d3e5
update EC data-parity error message
Aug 9, 2022
48f25ea
update EC data-parity error message
Aug 9, 2022
4cd011c
Fix code style
Aug 9, 2022
fcdfd2a
Fix unit test
Aug 9, 2022
aa9eb3a
Fix line length
Aug 9, 2022
ef55e98
Fix line length
Aug 9, 2022
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
8 changes: 5 additions & 3 deletions ...p-hdds/common/src/main/java/org/apache/hadoop/hdds/client/ReplicationConfigValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@ public ReplicationConfig validate(ReplicationConfig replicationConfig) {
replication = ecConfig.getCodec() + "-" + ecConfig.getData() +
"-" + ecConfig.getParity() + "-{CHUNK_SIZE}";
}
throw new IllegalArgumentException("Invalid replication config " +
"for type " + replicationConfig.getReplicationType() +
" and replication " + replication);
throw new IllegalArgumentException(
"Invalid data-parity replication config " +
"for type " + replicationConfig.getReplicationType() +
" and replication " + replication + "." +
" Supported data-parity are 3-2,6-3,10-4");
Comment on lines +65 to +68
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the late review.

This exception may be thrown for non-EC replication config, too, in which case data-parity is not applicable. The message should be different based on replication type.

CLI commands validate RATIS replication factor before reaching this check, but Java code using RpcClient#createKey directly could encounter this problem.

}
}
return replicationConfig;
Expand Down
6 changes: 4 additions & 2 deletions ...ds/common/src/test/java/org/apache/hadoop/hdds/client/TestReplicationConfigValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ public void testValidation() {
try {
validator.validate(new ECReplicationConfig(invalidEcConfig1));
} catch (IllegalArgumentException ex) {
GenericTestUtils.assertExceptionContains("Invalid replication " +
"config for type EC and replication xor-6-4-{CHUNK_SIZE}", ex);
GenericTestUtils.assertExceptionContains(
"Invalid data-parity replication " +
"config for type EC and replication xor-6-4-{CHUNK_SIZE}. " +
"Supported data-parity are 3-2,6-3,10-4", ex);
}

}
Expand Down