yifan-c commented on code in PR #171:
URL: https://github.com/apache/cassandra-sidecar/pull/171#discussion_r1955390285
##########
server/src/main/java/org/apache/cassandra/sidecar/restore/RestoreJobConsistencyChecker.java:
##########
@@ -146,45 +150,103 @@ private boolean
shouldForceRestoreJobDiscoverRun(RestoreJob restoreJob, List<Res
return false;
}
+ @SuppressWarnings("UnstableApiUsage")
private static void concludeRanges(List<RestoreRange> ranges,
TokenRangeReplicasResponse topology,
ConsistencyVerifier verifier,
RestoreRangeStatus successCriteria,
RestoreJobProgressCollector collector)
{
- for (RestoreRange range : ranges)
+ RangeMap<Token, InstanceSetByDc> replicasPerRange =
populateReplicas(topology);
+ Map<Range<Token>, Pair<Map<String, RestoreRangeStatus>, RestoreRange>>
statusPerRange = populateStatusByReplica(ranges);
+
+ for (Map.Entry<Range<Token>, Pair<Map<String, RestoreRangeStatus>,
RestoreRange>> entry : statusPerRange.entrySet())
{
if (!collector.canCollectMore())
{
return;
}
- ConsistencyVerificationResult res = concludeOneRange(topology,
verifier, successCriteria, range);
- collector.collect(range, res);
+ Range<Token> tokenRange = entry.getKey();
+ Map<String, RestoreRangeStatus> status =
entry.getValue().getLeft();
+ RestoreRange relevantRestoreRange = entry.getValue().getRight();
+ ConsistencyVerificationResult res =
concludeOneRange(replicasPerRange, verifier, successCriteria, tokenRange,
status);
+ collector.collect(relevantRestoreRange, res);
}
}
+ @SuppressWarnings("UnstableApiUsage")
+ static RangeMap<Token, InstanceSetByDc>
populateReplicas(TokenRangeReplicasResponse topology)
+ {
+ RangeMap<Token, InstanceSetByDc> replicasPerRange =
TreeRangeMap.create();
+ for (TokenRangeReplicasResponse.ReplicaInfo replicaInfo :
topology.writeReplicas())
+ {
+ TokenRange tokenRange = new
TokenRange(Token.from(replicaInfo.start()), Token.from(replicaInfo.end()));
+ Map<String, List<String>> replicasByDc =
replicaInfo.replicasByDatacenter();
+ Map<String, Set<String>> mapping = new
HashMap<>(replicasByDc.size());
+ replicasByDc.forEach((k, instances) -> mapping.put(k, new
HashSet<>(instances)));
Review Comment:
I cannot recall why `k` was there. Thanks for noticing it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
