(accumulo) branch 2.1 updated: sets error ref when compactor catches cancellation exception (#4630)

[kt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
     new fde18195a2 sets error ref when compactor catches cancellation exception (#4630)
fde18195a2 is described below

commit fde18195a20ee1ecb5f4c6e1d6156e837a695572
Author: Keith Turner <kt...@apache.org>
AuthorDate: Mon Jun 3 19:13:45 2024 -0400

    sets error ref when compactor catches cancellation exception (#4630)
    
    The compactor was not setting an error reference when it caught a
    cancelation exception.  This could cause the compactor to report
    success back to the coordinator.
---
 .../compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index e5d0c186f3..278c121dd6 100644
--- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@ -559,6 +559,7 @@ public class Compactor extends AbstractServer implements MetricsProducer, Compac
         updateCompactionState(job, update2);
       } catch (FileCompactor.CompactionCanceledException cce) {
         LOG.debug("Compaction canceled {}", job.getExternalCompactionId());
+        err.set(cce);
       } catch (Exception e) {
         KeyExtent fromThriftExtent = KeyExtent.fromThrift(job.getExtent());
         LOG.error("Compaction failed: id: {}, extent: {}", job.getExternalCompactionId(),