Merge pull request #21246 from vespa-engine/havardpe/report-issue-on-timeout

report request timeouts as issues (errors in reply)

2 files changed, 6 insertions, 0 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
index 0978a0a9bae..8489a68af15 100644
--- a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
@@ -152,6 +152,9 @@ MatchEngine::performSearch(search::engine::SearchRequest::Source req)
             }
         }
         _threadBundlePool.release(std::move(threadBundle));
+        if (searchRequest->expired()) {
+            vespalib::Issue::report("search request timed out; results may be incomplete");
+        }
     }
     ret->request = req.release();
     if (_forward_issues) {
diff --git a/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp b/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp
index a42fab782cb..0bf5b351fd0 100644
--- a/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp
@@ -143,6 +143,9 @@ SummaryEngine::getDocsums(DocsumRequest::UP req)
             }
         }
         updateDocsumMetrics(vespalib::to_s(req->getTimeUsed()), getNumDocs(*reply));
+        if (req->expired()) {
+            vespalib::Issue::report("docsum request timed out; results may be incomplete");
+        }
     }
     if (! reply) {
         reply = std::make_unique<DocsumReply>();