-
Notifications
You must be signed in to change notification settings - Fork 594
HDDS-12785. Add an option to disable lifecycle configuration from OM #9638
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.
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
chungen0126
wants to merge
4
commits into
apache:HDDS-8342
Choose a base branch
from
chungen0126:HDDS-12785
base: HDDS-8342
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+205
−7
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
90 changes: 90 additions & 0 deletions
90
...-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMDisableLifecycle.java
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 |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.hadoop.ozone.om; | ||
|
|
||
| import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.FEATURE_NOT_ENABLED; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
| import static org.mockito.Mockito.doCallRealMethod; | ||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| import java.io.IOException; | ||
| import org.apache.hadoop.ozone.om.exceptions.OMException; | ||
| import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils; | ||
| import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; | ||
| import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest; | ||
| import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; | ||
| import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status; | ||
| import org.apache.hadoop.ozone.protocolPB.OzoneManagerRequestHandler; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| /** | ||
| * Try different configs against OzoneManager#checkLifecycleEnabled and verify its response. | ||
| */ | ||
| public class TestOMDisableLifecycle { | ||
|
|
||
| @Test | ||
| public void testLifecycleWhenDisabled() throws Exception { | ||
| final OzoneManager om = mock(OzoneManager.class); | ||
| doCallRealMethod().when(om).checkLifecycleEnabled(); | ||
| final String volumeName = "vol1"; | ||
| final String bucketName = "bucket1"; | ||
|
|
||
| // Check that Lifecycle writes requests are blocked when not enabled | ||
| expectWriteRequestToFail(om, OMRequestTestUtils.setLifecycleConfigurationRequest(volumeName, bucketName)); | ||
| expectWriteRequestToFail(om, OMRequestTestUtils.deleteLifecycleConfigurationRequest(volumeName, bucketName)); | ||
| expectWriteRequestToFail(om, OMRequestTestUtils.setLifecycleServiceStatus()); | ||
|
|
||
| // Check that Lifecycle read requests are blocked when not enabled | ||
|
|
||
| final OzoneManagerRequestHandler ozoneManagerRequestHandler = | ||
| new OzoneManagerRequestHandler(om); | ||
|
|
||
| expectReadRequestToFail(ozoneManagerRequestHandler, | ||
| OMRequestTestUtils.getLifecycleConfigurationRequest(volumeName, bucketName)); | ||
| expectReadRequestToFail(ozoneManagerRequestHandler, | ||
| OMRequestTestUtils.getLifecycleServiceStatus()); | ||
| } | ||
|
|
||
| /** | ||
| * Helper function for testLifecycleRPCWhenDisabled. | ||
| */ | ||
| private void expectWriteRequestToFail(OzoneManager om, OMRequest request) | ||
| throws IOException { | ||
| OMException e = | ||
| assertThrows(OMException.class, () -> OzoneManagerRatisUtils.createClientRequest(request, om)); | ||
| assertEquals(FEATURE_NOT_ENABLED, e.getResult()); | ||
| } | ||
|
|
||
| /** | ||
| * Helper function for tesLifecycleRPCWhenDisabled. | ||
| */ | ||
| private void expectReadRequestToFail(OzoneManagerRequestHandler handler, | ||
| OMRequest omRequest) { | ||
|
|
||
| // handleReadRequest does not throw | ||
| OMResponse omResponse = handler.handleReadRequest(omRequest); | ||
| assertFalse(omResponse.getSuccess()); | ||
| assertEquals(Status.FEATURE_NOT_ENABLED, omResponse.getStatus()); | ||
| assertTrue(omResponse.getMessage() | ||
| .startsWith("OM Lifecycle feature is not enabled.")); | ||
| } | ||
|
|
||
| } |
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
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.
Please use
OZONE_KEY_LIFECYCLE_SERVICE_ENABLEDinstead of hardcoding it.