Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-31100 ROXIE_ALIVE message may contain some stats #18210

Merged
merged 1 commit into from
Jan 11, 2024
Merged

HPCC-31100 ROXIE_ALIVE message may contain some stats #18210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions roxie/ccd/ccdqueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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))
Expand Down Expand Up @@ -2711,7 +2712,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase
if (testAgentFailure & 0x1 && !retries)
return;
#endif
AgentContextLogger logctx(packet);
if (doTrace(traceRoxiePackets))
{
StringBuffer buf;
Expand All @@ -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)
{
Expand Down Expand Up @@ -3548,11 +3547,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()
{
}

Expand Down
Loading