-
Notifications
You must be signed in to change notification settings - Fork 637
HDDS-16012. Detect replicas with equal BCSID and mismatched data checksums #11199
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
F64116045
wants to merge
2
commits into
apache:master
Choose a base branch
from
F64116045:HDDS-16012
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.
+877
−81
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
68 changes: 68 additions & 0 deletions
68
.../src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReplicaChecksumMismatch.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,68 @@ | ||
| /* | ||
| * 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.container; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.Objects; | ||
| import java.util.function.Function; | ||
| import java.util.function.ToLongFunction; | ||
|
|
||
| /** | ||
| * Detects different data checksums reported for the same container replica | ||
| * sequence ID. | ||
| */ | ||
| public final class ContainerReplicaChecksumMismatch { | ||
|
|
||
| private ContainerReplicaChecksumMismatch() { | ||
| } | ||
|
|
||
| /** | ||
| * Returns true when replicas with the same sequence ID report different | ||
| * non-zero data checksums. If any replica has not reported a sequence ID or | ||
| * checksum yet, no comparison is made. | ||
| */ | ||
| public static <T> boolean hasMismatch(Collection<T> replicas, | ||
| Function<T, Long> sequenceId, ToLongFunction<T> dataChecksum) { | ||
| Objects.requireNonNull(sequenceId, "sequenceId == null"); | ||
| Objects.requireNonNull(dataChecksum, "dataChecksum == null"); | ||
|
|
||
| if (replicas == null || replicas.size() < 2) { | ||
| return false; | ||
| } | ||
|
|
||
| for (T replica : replicas) { | ||
| Long replicaSequenceId = sequenceId.apply(replica); | ||
| long replicaDataChecksum = dataChecksum.applyAsLong(replica); | ||
| if (replicaSequenceId == null || replicaDataChecksum == 0) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| for (T left : replicas) { | ||
| Long leftSequenceId = sequenceId.apply(left); | ||
| long leftDataChecksum = dataChecksum.applyAsLong(left); | ||
| for (T right : replicas) { | ||
| if (leftSequenceId.equals(sequenceId.apply(right)) && | ||
| leftDataChecksum != dataChecksum.applyAsLong(right)) { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
44 changes: 44 additions & 0 deletions
44
...common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReplicaInfoResult.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,44 @@ | ||
| /* | ||
| * 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.container; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Container replica information and the checksum mismatch state determined | ||
| * by SCM. | ||
| */ | ||
| public final class ContainerReplicaInfoResult { | ||
|
|
||
| private final List<ContainerReplicaInfo> replicas; | ||
| private final boolean dataChecksumMismatch; | ||
|
|
||
| public ContainerReplicaInfoResult(List<ContainerReplicaInfo> replicas, | ||
| boolean dataChecksumMismatch) { | ||
| this.replicas = replicas; | ||
| this.dataChecksumMismatch = dataChecksumMismatch; | ||
| } | ||
|
|
||
| public List<ContainerReplicaInfo> getReplicas() { | ||
| return replicas; | ||
| } | ||
|
|
||
| public boolean hasDataChecksumMismatch() { | ||
| return dataChecksumMismatch; | ||
| } | ||
| } |
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
117 changes: 117 additions & 0 deletions
117
.../test/java/org/apache/hadoop/hdds/scm/container/TestContainerReplicaChecksumMismatch.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,117 @@ | ||
| /* | ||
| * 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.container; | ||
|
|
||
| import static org.apache.hadoop.hdds.scm.container.ContainerReplicaChecksumMismatch.hasMismatch; | ||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class TestContainerReplicaChecksumMismatch { | ||
|
|
||
| @Test | ||
| void detectsDifferentChecksumsAtTheSameSequenceId() { | ||
| List<Replica> replicas = Arrays.asList( | ||
| new Replica(10L, 100L), | ||
| new Replica(10L, 200L), | ||
| new Replica(10L, 100L)); | ||
|
|
||
| assertTrue(hasMismatch(replicas, Replica::getSequenceId, | ||
| Replica::getDataChecksum)); | ||
| } | ||
|
|
||
| @Test | ||
| void ignoresDifferentChecksumsAtDifferentSequenceIds() { | ||
| List<Replica> replicas = Arrays.asList( | ||
| new Replica(10L, 100L), | ||
| new Replica(11L, 200L)); | ||
|
|
||
| assertFalse(hasMismatch(replicas, Replica::getSequenceId, | ||
| Replica::getDataChecksum)); | ||
| } | ||
|
|
||
| @Test | ||
| void ignoresEqualChecksumsAtDifferentSequenceIds() { | ||
| List<Replica> replicas = Arrays.asList( | ||
| new Replica(10L, 100L), | ||
| new Replica(11L, 100L)); | ||
|
|
||
| assertFalse(hasMismatch(replicas, Replica::getSequenceId, | ||
| Replica::getDataChecksum)); | ||
| } | ||
|
|
||
| @Test | ||
| void detectsMismatchWithinOneSequenceIdGroup() { | ||
| List<Replica> replicas = Arrays.asList( | ||
| new Replica(10L, 100L), | ||
| new Replica(11L, 200L), | ||
| new Replica(11L, 300L)); | ||
|
|
||
| assertTrue(hasMismatch(replicas, Replica::getSequenceId, | ||
| Replica::getDataChecksum)); | ||
| } | ||
|
|
||
| @Test | ||
| void waitsUntilEveryReplicaReportsADataChecksum() { | ||
| List<Replica> replicas = Arrays.asList( | ||
| new Replica(10L, 100L), | ||
| new Replica(10L, 200L), | ||
| new Replica(10L, 0L)); | ||
|
|
||
| assertFalse(hasMismatch(replicas, Replica::getSequenceId, | ||
| Replica::getDataChecksum)); | ||
| } | ||
|
|
||
| @Test | ||
| void waitsUntilEveryReplicaReportsASequenceId() { | ||
| List<Replica> replicas = Arrays.asList( | ||
| new Replica(10L, 100L), | ||
| new Replica(null, 200L)); | ||
|
|
||
| assertFalse(hasMismatch(replicas, Replica::getSequenceId, | ||
| Replica::getDataChecksum)); | ||
| } | ||
|
|
||
| @Test | ||
| void requiresAtLeastTwoReplicas() { | ||
| assertFalse(hasMismatch(Collections.singletonList(new Replica(10L, 100L)), | ||
| Replica::getSequenceId, Replica::getDataChecksum)); | ||
| } | ||
|
|
||
| private static final class Replica { | ||
| private final Long sequenceId; | ||
| private final long dataChecksum; | ||
|
|
||
| private Replica(Long sequenceId, long dataChecksum) { | ||
| this.sequenceId = sequenceId; | ||
| this.dataChecksum = dataChecksum; | ||
| } | ||
|
|
||
| private Long getSequenceId() { | ||
| return sequenceId; | ||
| } | ||
|
|
||
| private long getDataChecksum() { | ||
| return dataChecksum; | ||
| } | ||
| } | ||
| } |
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
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.
I considered using a HashMap to make the comparison O(R), R is the replica count of one container.:
However, this check runs across the CLOSED RATIS containers during every full Replication Manager scan. Using a map would create a lot of short-lived maps in quick succession.
Since RATIS normally has only three replicas, the current O(R²) loop does 3 × 3 comparisons per container and avoids those allocations.