Merge remote-tracking branch 'origin/candidate-9.6.x'

Signed-off-by: Gavin Halliday <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # helm/hpcc/templates/dafilesrv.yaml # helm/hpcc/templates/dali.yaml # helm/hpcc/templates/dfuserver.yaml # helm/hpcc/templates/eclagent.yaml # helm/hpcc/templates/eclccserver.yaml # helm/hpcc/templates/eclscheduler.yaml # helm/hpcc/templates/esp.yaml # helm/hpcc/templates/localroxie.yaml # helm/hpcc/templates/roxie.yaml # helm/hpcc/templates/sasha.yaml # helm/hpcc/templates/thor.yaml # version.cmake
hpcc-systems · Jun 24, 2024 · 84529d4 · 84529d4
2 parents 63341d8 + 4174fb8
commit 84529d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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;
                 }
 

diff --git a/docs/PT_BR/ContainerizedHPCC/ContainerizedMods/ConfigureValues.xml b/docs/PT_BR/ContainerizedHPCC/ContainerizedMods/ConfigureValues.xml
@@ -1098,7 +1098,7 @@
         </sect4>
       </sect2>
 
-      <sect3 id="ENV_values_yaml">
+      <sect3 id="ENV_values-yaml1">
         <title>Environment Values</title>
 
         <para>Você pode definir variáveis de ambiente em um arquivo YAML. Os