Merge pull request #4836 from gchq/gh-4829

#4829 Fix stuck searches

Author: stroomdev66

Diff for: stroom-search/stroom-search-impl/src/main/java/stroom/search/impl/RemoteSearchService.java

@@ -108,19 +108,24 @@ public Boolean start(final NodeSearchTask nodeSearchTask) {
                                         // Tell the coprocessors they can complete now as we won't be receiving
                                         // payloads.
                                         LOGGER.trace(() -> "Search is complete, setting searchComplete to true and " +
-                                                "counting down searchCompleteLatch");
+                                                           "counting down searchCompleteLatch");
                                         coprocessors.getCompletionState().signalComplete();
 
                                         // Wait for the coprocessors to actually complete, i.e. consume last items from
-                                        // the queue and send laST payloads etc.
-                                        while (!coprocessors.getCompletionState().awaitCompletion(1,
-                                                TimeUnit.SECONDS)) {
+                                        // the queue and send last payloads etc.
+                                        while (!taskContext.isTerminated() &&
+                                               !coprocessors.getCompletionState().awaitCompletion(1,
+                                                       TimeUnit.SECONDS)) {
                                             nodeSearchTaskHandler.updateInfo();
                                         }
+
                                     } catch (final InterruptedException e) {
                                         LOGGER.trace(e::getMessage, e);
                                         // Keep interrupting this thread.
                                         Thread.currentThread().interrupt();
+
+                                    } finally {
+                                        coprocessors.clear();
                                     }
                                 }
                             });

Diff for: unreleased_changes/20250326_123117_493__4829.md

@@ -0,0 +1,24 @@
+* Issue **#4829** : Fix stuck searches.
+
+
+```sh
+# ********************************************************************************
+# Issue title: Search preventing shutdown / long running task: 7.8 and 7.9
+# Issue link:  https://github.com/gchq/stroom/issues/4829
+# ********************************************************************************
+
+# 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.
+```