-
Notifications
You must be signed in to change notification settings - Fork 599
HDDS-15121. Unify SCM list container on SCMListContainerRequestProto #10144
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
sarvekshayr
wants to merge
2
commits into
apache:master
Choose a base branch
from
sarvekshayr:HDDS-15121
base: master
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.
Open
Changes from all commits
Commits
Show all changes
2 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
184 changes: 184 additions & 0 deletions
184
...ework/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmListContainerRequestCodec.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,184 @@ | ||
| /* | ||
| * 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.hdds.scm.protocol; | ||
|
|
||
| import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType.EC; | ||
|
|
||
| import jakarta.annotation.Nullable; | ||
| import org.apache.hadoop.hdds.client.ECReplicationConfig; | ||
| import org.apache.hadoop.hdds.client.ReplicatedReplicationConfig; | ||
| import org.apache.hadoop.hdds.client.ReplicationConfig; | ||
| import org.apache.hadoop.hdds.protocol.proto.HddsProtos; | ||
| import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.SCMListContainerRequestProto; | ||
| import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.SCMListContainerRequestProto.Builder; | ||
|
|
||
| /** | ||
| * Codec between {@link SCMListContainerRequestProto} and {@link ListContainerQuery} for list containers. | ||
| */ | ||
| public final class ScmListContainerRequestCodec { | ||
|
|
||
| private ScmListContainerRequestCodec() { | ||
| } | ||
|
|
||
| /** | ||
| * Immutable view of list container request fields after {@link #fromProto}. | ||
| */ | ||
| public static final class ListContainerQuery { | ||
| private final long startContainerID; | ||
| private final int count; | ||
| @Nullable | ||
| private final HddsProtos.LifeCycleState state; | ||
| @Nullable | ||
| private final HddsProtos.ReplicationFactor factor; | ||
| @Nullable | ||
| private final HddsProtos.ReplicationType replicationType; | ||
| @Nullable | ||
| private final ReplicationConfig replicationConfig; | ||
| @Nullable | ||
| private final Boolean suppressed; | ||
|
|
||
| private ListContainerQuery(long startContainerID, int count, | ||
| @Nullable HddsProtos.LifeCycleState state, | ||
| @Nullable HddsProtos.ReplicationFactor factor, | ||
| @Nullable HddsProtos.ReplicationType replicationType, | ||
| @Nullable ReplicationConfig replicationConfig, | ||
| @Nullable Boolean suppressed) { | ||
| this.startContainerID = startContainerID; | ||
| this.count = count; | ||
| this.state = state; | ||
| this.factor = factor; | ||
| this.replicationType = replicationType; | ||
| this.replicationConfig = replicationConfig; | ||
| this.suppressed = suppressed; | ||
| } | ||
|
|
||
| public long getStartContainerID() { | ||
| return startContainerID; | ||
| } | ||
|
|
||
| public int getCount() { | ||
| return count; | ||
| } | ||
|
|
||
| @Nullable | ||
| public HddsProtos.LifeCycleState getState() { | ||
| return state; | ||
| } | ||
|
|
||
| @Nullable | ||
| public HddsProtos.ReplicationFactor getFactor() { | ||
| return factor; | ||
| } | ||
|
|
||
| @Nullable | ||
| public HddsProtos.ReplicationType getReplicationType() { | ||
| return replicationType; | ||
| } | ||
|
|
||
| @Nullable | ||
| public ReplicationConfig getReplicationConfig() { | ||
| return replicationConfig; | ||
| } | ||
|
|
||
| @Nullable | ||
| public Boolean getSuppressed() { | ||
| return suppressed; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Builds {@link SCMListContainerRequestProto} from Java fields. | ||
| */ | ||
| @SuppressWarnings("checkstyle:ParameterNumber") | ||
| public static SCMListContainerRequestProto toProto( | ||
| long startContainerID, | ||
| int count, | ||
| @Nullable HddsProtos.LifeCycleState state, | ||
| @Nullable HddsProtos.ReplicationFactor factor, | ||
| @Nullable HddsProtos.ReplicationType replicationType, | ||
| @Nullable ReplicationConfig repConfig, | ||
| @Nullable Boolean suppressed, | ||
| @Nullable String traceId) { | ||
| Builder builder = SCMListContainerRequestProto.newBuilder() | ||
| .setCount(count) | ||
| .setStartContainerID(startContainerID); | ||
| if (traceId != null) { | ||
| builder.setTraceID(traceId); | ||
| } | ||
| if (suppressed != null) { | ||
| builder.setSuppressed(suppressed); | ||
| } | ||
| if (state != null) { | ||
| builder.setState(state); | ||
| } | ||
| if (repConfig != null) { | ||
| HddsProtos.ReplicationType repType = repConfig.getReplicationType(); | ||
| if (repType == EC) { | ||
| builder.setType(EC); | ||
| builder.setEcReplicationConfig(((ECReplicationConfig) repConfig).toProto()); | ||
| } else { | ||
| builder.setType(repType); | ||
| builder.setFactor(((ReplicatedReplicationConfig) repConfig) | ||
| .getReplicationFactor()); | ||
| } | ||
| } else if (replicationType != null) { | ||
| builder.setType(replicationType); | ||
| } else if (factor != null) { | ||
| builder.setFactor(factor); | ||
| } | ||
| return builder.build(); | ||
| } | ||
|
|
||
| /** | ||
| * Decodes {@link SCMListContainerRequestProto} into {@link ListContainerQuery}. | ||
| */ | ||
| public static ListContainerQuery fromProto(SCMListContainerRequestProto request) { | ||
| long startContainerID = 0L; | ||
| if (request.hasStartContainerID()) { | ||
| startContainerID = request.getStartContainerID(); | ||
| } | ||
| int count = request.getCount(); | ||
| HddsProtos.LifeCycleState state = null; | ||
| HddsProtos.ReplicationFactor factor = null; | ||
| HddsProtos.ReplicationType replicationType = null; | ||
| ReplicationConfig repConfig = null; | ||
| if (request.hasState()) { | ||
| state = request.getState(); | ||
| } | ||
| if (request.hasType()) { | ||
| replicationType = request.getType(); | ||
| } | ||
| if (replicationType != null) { | ||
| if (replicationType == EC) { | ||
| if (request.hasEcReplicationConfig()) { | ||
| repConfig = new ECReplicationConfig(request.getEcReplicationConfig()); | ||
| } | ||
| } else { | ||
| if (request.hasFactor()) { | ||
| repConfig = ReplicationConfig | ||
| .fromProtoTypeAndFactor(replicationType, request.getFactor()); | ||
| } | ||
| } | ||
| } else if (request.hasFactor()) { | ||
| factor = request.getFactor(); | ||
| } | ||
| Boolean suppressed = request.hasSuppressed() ? request.getSuppressed() : null; | ||
| return new ListContainerQuery(startContainerID, count, state, factor, | ||
| replicationType, repConfig, suppressed); | ||
| } | ||
| } | ||
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
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.
Uh oh!
There was an error while loading. Please reload this page.