Merge pull request #4820 from gchq/gh-4733

#4733 Fix report shutdown error

Author: stroomdev66

Diff for: stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/ReportExecutor.java

@@ -280,9 +280,12 @@ boolean process(final ReportDoc reportDoc,
                 LOGGER.error(e2::getMessage, e2);
             }
 
-            // Disable future execution.
-            LOGGER.info(() -> LogUtil.message("Disabling: {}", RuleUtil.getRuleIdentity(reportDoc)));
-            executionScheduleDao.updateExecutionSchedule(executionSchedule.copy().enabled(false).build());
+            // Disable future execution if the error was not an interrupted exception.
+            if (!(e instanceof InterruptedException)) {
+                // Disable future execution.
+                LOGGER.info(() -> LogUtil.message("Disabling: {}", RuleUtil.getRuleIdentity(reportDoc)));
+                executionScheduleDao.updateExecutionSchedule(executionSchedule.copy().enabled(false).build());
+            }
 
         } finally {
             // Record the execution.

Diff for: stroom-query/stroom-query-common/src/main/java/stroom/query/common/v2/ResultStoreManager.java

@@ -514,7 +514,8 @@ public Boolean destroy(final QueryKey queryKey,
         try {
             return completableFuture.get();
         } catch (final InterruptedException | ExecutionException e) {
-            throw new RuntimeException(e.getMessage(), e);
+            LOGGER.debug(e::getMessage, e);
+            return false;
         }
     }
 

Diff for: unreleased_changes/20250317_095831_929__4733.md

@@ -0,0 +1,24 @@
+* Issue **#4733** : Fix report shutdown error.
+
+
+```sh
+# ********************************************************************************
+# Issue title: Report Errored, likely during shutdown
+# Issue link:  https://github.com/gchq/stroom/issues/4733
+# ********************************************************************************
+
+# ONLY the top line will be included as a change entry in the CHANGELOG.
+# The entry should be in GitHub flavour markdown and should be written on a SINGLE
+# line with no hard breaks. You can have multiple change files for a single GitHub issue.
+# The  entry should be written in the imperative mood, i.e. 'Fix nasty bug' rather than
+# 'Fixed nasty bug'.
+#
+# Examples of acceptable entries are:
+#
+#
+# * Issue **123** : Fix bug with an associated GitHub issue in this repository
+#
+# * Issue **namespace/other-repo#456** : Fix bug with an associated GitHub issue in another repository
+#
+# * Fix bug with no associated GitHub issue.
+```