thomasmueller commented on code in PR #538:
URL: https://github.com/apache/jackrabbit-oak/pull/538#discussion_r849667688
##########
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:
Here as well: the code flow will return mergedFile (after the finally).
##########
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:
So this is logged... but I don't see where it's actually skipped: it will
still return mergedFile...
--
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]
