HDDS-12983. Validator Registry Changes for Supporting Version based validations #8404
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,7 @@ | |
| import org.apache.hadoop.hdds.utils.db.TableIterator; | ||
| import org.apache.hadoop.hdds.utils.db.cache.CacheKey; | ||
| import org.apache.hadoop.hdds.utils.db.cache.CacheValue; | ||
| import org.apache.hadoop.ozone.ClientVersion; | ||
| import org.apache.hadoop.ozone.OzoneConsts; | ||
| import org.apache.hadoop.ozone.audit.AuditLogger; | ||
| import org.apache.hadoop.ozone.audit.OMAction; | ||
|
|
@@ -45,8 +46,7 @@ | |
| import org.apache.hadoop.ozone.om.helpers.SnapshotInfo; | ||
| import org.apache.hadoop.ozone.om.request.OMClientRequest; | ||
| import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; | ||
| import org.apache.hadoop.ozone.om.request.validation.OMClientVersionValidator; | ||
| import org.apache.hadoop.ozone.om.request.validation.ValidationContext; | ||
| import org.apache.hadoop.ozone.om.response.OMClientResponse; | ||
| import org.apache.hadoop.ozone.om.response.bucket.OMBucketDeleteResponse; | ||
|
|
@@ -273,10 +273,10 @@ private boolean bucketContainsSnapshotInCache( | |
| * @return the validated request | ||
| * @throws OMException if the request is invalid | ||
| */ | ||
| @OMClientVersionValidator( | ||
| processingPhase = RequestProcessingPhase.PRE_PROCESS, | ||
| requestType = Type.DeleteBucket, | ||
| applyBefore = ClientVersion.BUCKET_LAYOUT_SUPPORT | ||
| ) | ||
| public static OMRequest blockBucketDeleteWithBucketLayoutFromOldClient( | ||
| OMRequest req, ValidationContext ctx) throws IOException { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,8 +44,7 @@ | |
| import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; | ||
| import org.apache.hadoop.ozone.om.request.OMClientRequest; | ||
| import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; | ||
| import org.apache.hadoop.ozone.om.request.validation.OMLayoutVersionValidator; | ||
| import org.apache.hadoop.ozone.om.request.validation.ValidationContext; | ||
| import org.apache.hadoop.ozone.om.response.OMClientResponse; | ||
| import org.apache.hadoop.ozone.om.response.bucket.OMBucketSetPropertyResponse; | ||
|
|
@@ -352,10 +351,10 @@ public boolean checkQuotaNamespaceValid(OmVolumeArgs omVolumeArgs, | |
| return true; | ||
| } | ||
|
|
||
| @OMLayoutVersionValidator( | ||
| processingPhase = RequestProcessingPhase.PRE_PROCESS, | ||
| requestType = Type.SetBucketProperty, | ||
| applyBefore = OMLayoutFeature.ERASURE_CODED_STORAGE_SUPPORT | ||
| ) | ||
| public static OMRequest disallowSetBucketPropertyWithECReplicationConfig( | ||
| OMRequest req, ValidationContext ctx) throws OMException { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,6 +31,7 @@ | |
| import java.nio.file.Paths; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.apache.hadoop.ozone.ClientVersion; | ||
| import org.apache.hadoop.ozone.audit.AuditLogger; | ||
| import org.apache.hadoop.ozone.audit.OMAction; | ||
| import org.apache.hadoop.ozone.om.OMMetadataManager; | ||
|
|
@@ -43,8 +44,8 @@ | |
| import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; | ||
| import org.apache.hadoop.ozone.om.request.key.OMKeyRequest; | ||
| import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; | ||
| import org.apache.hadoop.ozone.om.request.validation.OMClientVersionValidator; | ||
| import org.apache.hadoop.ozone.om.request.validation.OMLayoutVersionValidator; | ||
| import org.apache.hadoop.ozone.om.request.validation.ValidationContext; | ||
| import org.apache.hadoop.ozone.om.response.OMClientResponse; | ||
| import org.apache.hadoop.ozone.om.response.file.OMDirectoryCreateResponse; | ||
|
|
@@ -262,10 +263,10 @@ private void logResult(CreateDirectoryRequest createDirectoryRequest, | |
| } | ||
| } | ||
|
|
||
| @OMLayoutVersionValidator( | ||
| processingPhase = RequestProcessingPhase.PRE_PROCESS, | ||
| requestType = Type.CreateDirectory, | ||
| applyBefore = OMLayoutFeature.ERASURE_CODED_STORAGE_SUPPORT | ||
|
Contributor
There was a problem hiding this comment. Please simply replace the two changed lines instead of moving things around. - @RequestFeatureValidator(
- conditions = ValidationCondition.CLUSTER_NEEDS_FINALIZATION,
+ @OMLayoutVersionValidator(
+ applyBefore = OMLayoutFeature.ERASURE_CODED_STORAGE_SUPPORT, |
||
| ) | ||
| public static OMRequest disallowCreateDirectoryWithECReplicationConfig( | ||
| OMRequest req, ValidationContext ctx) throws OMException { | ||
|
|
@@ -295,10 +296,10 @@ public static OMRequest disallowCreateDirectoryWithECReplicationConfig( | |
| * @return the validated request | ||
| * @throws OMException if the request is invalid | ||
| */ | ||
| @OMClientVersionValidator( | ||
| processingPhase = RequestProcessingPhase.PRE_PROCESS, | ||
| requestType = Type.CreateDirectory, | ||
| applyBefore = ClientVersion.BUCKET_LAYOUT_SUPPORT | ||
| ) | ||
| public static OMRequest blockCreateDirectoryWithBucketLayoutFromOldClient( | ||
| OMRequest req, ValidationContext ctx) throws IOException { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,6 +36,7 @@ | |
| import org.apache.hadoop.hdds.protocol.proto.HddsProtos; | ||
| import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList; | ||
| import org.apache.hadoop.hdds.utils.UniqueId; | ||
| import org.apache.hadoop.ozone.ClientVersion; | ||
| import org.apache.hadoop.ozone.OzoneConsts; | ||
| import org.apache.hadoop.ozone.audit.OMAction; | ||
| import org.apache.hadoop.ozone.om.OMMetadataManager; | ||
|
|
@@ -50,8 +51,8 @@ | |
| import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo; | ||
| import org.apache.hadoop.ozone.om.request.key.OMKeyRequest; | ||
| import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; | ||
| import org.apache.hadoop.ozone.om.request.validation.OMClientVersionValidator; | ||
| import org.apache.hadoop.ozone.om.request.validation.OMLayoutVersionValidator; | ||
| import org.apache.hadoop.ozone.om.request.validation.ValidationContext; | ||
| import org.apache.hadoop.ozone.om.response.OMClientResponse; | ||
| import org.apache.hadoop.ozone.om.response.file.OMFileCreateResponse; | ||
|
|
@@ -381,10 +382,10 @@ protected void checkAllParentsExist(KeyArgs keyArgs, | |
| } | ||
| } | ||
|
|
||
| @OMLayoutVersionValidator( | ||
| processingPhase = RequestProcessingPhase.PRE_PROCESS, | ||
| requestType = CreateFile, | ||
| applyBefore = OMLayoutFeature.ERASURE_CODED_STORAGE_SUPPORT | ||
| ) | ||
| public static OMRequest disallowCreateFileWithECReplicationConfig( | ||
| OMRequest req, ValidationContext ctx) throws OMException { | ||
|
|
@@ -413,10 +414,10 @@ public static OMRequest disallowCreateFileWithECReplicationConfig( | |
| * @return the validated request | ||
| * @throws OMException if the request is invalid | ||
| */ | ||
| @OMClientVersionValidator( | ||
| processingPhase = RequestProcessingPhase.PRE_PROCESS, | ||
| requestType = Type.CreateFile, | ||
| applyBefore = ClientVersion.BUCKET_LAYOUT_SUPPORT | ||
| ) | ||
| public static OMRequest blockCreateFileWithBucketLayoutFromOldClient( | ||
| OMRequest req, ValidationContext ctx) throws IOException { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Created #9530 to reduce the change that this PR needs to make in POM files. The other PR:
RequestFeatureValidatorfrom modules where it's not even accessibleSo this PR will only need to update POMs for the removal of
RequestFeatureValidator, and only in fewer modules.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merged with master branch