You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jackrabbit.apache.org by GitBox <gi...@apache.org> on 2022/04/13 22:01:13 UTC
[GitHub] [jackrabbit-oak] Ewocker commented on a diff in pull request #538: OAK-9748 Parallel Merge does not handle download retry correctly
Ewocker commented on code in PR #538:
URL: https://github.com/apache/jackrabbit-oak/pull/538#discussion_r849932595
##########
oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeRunner.java:
##########
@@ -297,14 +332,18 @@ private class Task implements Callable<File> {
mergeTaskPhaser.register();
}
+
@Override
public File call() {
try {
- if (merge(mergeTarget, mergedFile)) {
+ if (mergeCancelled.get()) {
+ log.debug("merge cancelled, skipping merge task");
+ } else if (merge(mergeTarget, mergedFile)) {
log.info("merge complete for {}", mergedFile.getName());
return mergedFile;
+ } else {
+ log.error("merge failed for {}", mergedFile.getName());
Review Comment:
add throw
##########
oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeRunner.java:
##########
@@ -297,14 +332,18 @@ private class Task implements Callable<File> {
mergeTaskPhaser.register();
}
+
@Override
public File call() {
try {
- if (merge(mergeTarget, mergedFile)) {
+ if (mergeCancelled.get()) {
+ log.debug("merge cancelled, skipping merge task");
Review Comment:
add throw
--
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: dev-unsubscribe@jackrabbit.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org