From b983bfeb2000163d804c8f5428b216b33f6264a6 Mon Sep 17 00:00:00 2001 From: M Kelly Date: Thu, 20 Jun 2024 12:19:39 -0400 Subject: [PATCH] HPCC-32103 Roxie crash in soapcall after reaching TIMELIMIT Signed-off-by: M Kelly --- common/thorhelper/thorsoapcall.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/thorhelper/thorsoapcall.cpp b/common/thorhelper/thorsoapcall.cpp index bee4d69b47d..2e9635fc886 100644 --- a/common/thorhelper/thorsoapcall.cpp +++ b/common/thorhelper/thorsoapcall.cpp @@ -2642,12 +2642,11 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo { // other roxie exception ... master->logctx.CTXLOG("Exiting: received Roxie exception"); + master->activitySpanScope->recordException(e, true, true); if (e->errorRow()) processException(url, e->errorRow(), e); else processException(url, inputRows, e); - - master->activitySpanScope->recordException(e, true, true); break; } } @@ -2657,10 +2656,10 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo persistentHandler->doneUsing(socket, false); if (master->timeLimitExceeded) { - processException(url, inputRows, e); VStringBuffer msg("%s exiting: time limit (%ums) exceeded", getWsCallTypeName(master->wscType), master->timeLimitMS); master->logctx.CTXLOG("%s", msg.str()); master->activitySpanScope->recordError(SpanError(msg.str(), e->errorCode(), true, true)); + processException(url, inputRows, e); break; }