Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor normal/preview/IR repair to standardize repair cleanup and e…
…rror handling of failed RepairJobs patch by David Capwell; reviewed by Marcus Eriksson for CASSANDRA-17069
- Loading branch information
Showing
35 changed files
with
1,124 additions
and
556 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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 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 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 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 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 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 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
122 changes: 122 additions & 0 deletions
122
src/java/org/apache/cassandra/repair/AbstractRepairTask.java
This file contains 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,122 @@ | ||
| /* | ||
| * 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.cassandra.repair; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.UUID; | ||
|
|
||
| import com.google.common.collect.Lists; | ||
| import com.google.common.util.concurrent.FutureCallback; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import org.apache.cassandra.concurrent.ExecutorPlus; | ||
| import org.apache.cassandra.dht.Range; | ||
| import org.apache.cassandra.dht.Token; | ||
| import org.apache.cassandra.repair.messages.RepairOption; | ||
| import org.apache.cassandra.service.ActiveRepairService; | ||
| import org.apache.cassandra.utils.concurrent.Future; | ||
| import org.apache.cassandra.utils.concurrent.FutureCombiner; | ||
|
|
||
| public abstract class AbstractRepairTask implements RepairTask | ||
| { | ||
| protected static final Logger logger = LoggerFactory.getLogger(AbstractRepairTask.class); | ||
|
|
||
| protected final RepairOption options; | ||
| protected final String keyspace; | ||
| protected final RepairNotifier notifier; | ||
|
|
||
| protected AbstractRepairTask(RepairOption options, String keyspace, RepairNotifier notifier) | ||
| { | ||
| this.options = Objects.requireNonNull(options); | ||
| this.keyspace = Objects.requireNonNull(keyspace); | ||
| this.notifier = Objects.requireNonNull(notifier); | ||
| } | ||
|
|
||
| private List<RepairSession> submitRepairSessions(UUID parentSession, | ||
| boolean isIncremental, | ||
| ExecutorPlus executor, | ||
| List<CommonRange> commonRanges, | ||
| String... cfnames) | ||
| { | ||
| List<RepairSession> futures = new ArrayList<>(options.getRanges().size()); | ||
|
|
||
| for (CommonRange commonRange : commonRanges) | ||
| { | ||
| logger.info("Starting RepairSession for {}", commonRange); | ||
| RepairSession session = ActiveRepairService.instance.submitRepairSession(parentSession, | ||
| commonRange, | ||
| keyspace, | ||
| options.getParallelism(), | ||
| isIncremental, | ||
| options.isPullRepair(), | ||
| options.getPreviewKind(), | ||
| options.optimiseStreams(), | ||
| executor, | ||
| cfnames); | ||
| if (session == null) | ||
| continue; | ||
| session.addCallback(new RepairSessionCallback(session)); | ||
| futures.add(session); | ||
| } | ||
| return futures; | ||
| } | ||
|
|
||
| protected Future<CoordinatedRepairResult> runRepair(UUID parentSession, | ||
| boolean isIncremental, | ||
| ExecutorPlus executor, | ||
| List<CommonRange> commonRanges, | ||
| String... cfnames) | ||
| { | ||
| List<RepairSession> allSessions = submitRepairSessions(parentSession, isIncremental, executor, commonRanges, cfnames); | ||
| List<Collection<Range<Token>>> ranges = Lists.transform(allSessions, RepairSession::ranges); | ||
| Future<List<RepairSessionResult>> f = FutureCombiner.successfulOf(allSessions); | ||
| return f.map(results -> { | ||
| logger.debug("Repair result: {}", results); | ||
| return CoordinatedRepairResult.create(ranges, results); | ||
| }); | ||
| } | ||
|
|
||
| private class RepairSessionCallback implements FutureCallback<RepairSessionResult> | ||
| { | ||
| private final RepairSession session; | ||
|
|
||
| public RepairSessionCallback(RepairSession session) | ||
| { | ||
| this.session = session; | ||
| } | ||
|
|
||
| public void onSuccess(RepairSessionResult result) | ||
| { | ||
| String message = String.format("Repair session %s for range %s finished", session.getId(), | ||
| session.ranges().toString()); | ||
| notifier.notifyProgress(message); | ||
| } | ||
|
|
||
| public void onFailure(Throwable t) | ||
| { | ||
| String message = String.format("Repair session %s for range %s failed with error %s", | ||
| session.getId(), session.ranges().toString(), t.getMessage()); | ||
| notifier.notifyError(new RuntimeException(message, t)); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.