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

Signed-off-by: Jake Smith <[email protected]>
AttilaVamos · Jan 11, 2024 · 3bca1fe · 3bca1fe
2 parents 335169b + 57bdd34
commit 3bca1fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
@@ -109,6 +109,9 @@ jobs:
             name: LN k8s
             ln: true
             container: true
+          - os: ubuntu-22.04
+            name: LN
+            ln: true
           - os: ubuntu-20.04
             name: LN
             ln: true

diff --git a/roxie/ccd/ccdqueue.cpp b/roxie/ccd/ccdqueue.cpp
@@ -2403,6 +2403,7 @@ class RoxieSocketQueueManager : public RoxieReceiverBase
     Owned<TokenBucket> bucket;
     unsigned maxPacketSize = 0;
     std::atomic<bool> running = { false };
+    StringContextLogger logctx;
 #ifdef NEW_IBYTI
     DelayedPacketQueueManager delayed;
 #endif
@@ -2426,7 +2427,7 @@ class RoxieSocketQueueManager : public RoxieReceiverBase
     } readThread;
 
 public:
-    RoxieSocketQueueManager(unsigned _numWorkers) : RoxieReceiverBase(_numWorkers), readThread(*this)
+    RoxieSocketQueueManager(unsigned _numWorkers) : RoxieReceiverBase(_numWorkers), logctx("RoxieSocketQueueManager"), readThread(*this)
     {
         maxPacketSize = multicastSocket->get_max_send_size();
         if ((maxPacketSize==0)||(maxPacketSize>65535))
@@ -2711,7 +2712,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase
                     if (testAgentFailure & 0x1 && !retries)
                         return;
 #endif
-                    AgentContextLogger logctx(packet);
                     if (doTrace(traceRoxiePackets))
                     {
                         StringBuffer buf;
@@ -2728,7 +2728,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase
                     if (retries >= SUBCHANNEL_MASK)
                         return; // someone sent a failure or something - ignore it
 
-                    AgentContextLogger logctx(packet);
                     // Send back an out-of-band immediately, to let Roxie server know that channel is still active
                     if (!(testAgentFailure & 0x800) && !acknowledgeAllRequests)
                     {
@@ -3529,11 +3528,10 @@ class RoxieLocalReceiveManager : implements ILocalReceiveManager, public CInterf
 {
     MapXToMyClass<ruid_t, ruid_t, ILocalMessageCollator> collators;
     CriticalSection crit;
-    Owned<StringContextLogger> logctx;
 
 public:
     IMPLEMENT_IINTERFACE;
-    RoxieLocalReceiveManager() : logctx(new StringContextLogger("RoxieLocalReceiveManager"))
+    RoxieLocalReceiveManager()
     {
     }