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.

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-32720 Fix multiJobLinger=false configurations #19149

Merged
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions thorlcr/master/thgraphmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1442,7 +1442,7 @@ void thorMain(ILogMsgHandler *logHandler, const char *wuid, const char *graphNam
unsigned lingerPeriod = globals->getPropInt("@lingerPeriod", defaultThorLingerPeriod)*1000;
bool multiJobLinger = globals->getPropBool("@multiJobLinger", defaultThorMultiJobLinger);
VStringBuffer multiJobLingerQueueName("%s_lingerqueue", globals->queryProp("@name"));
StringBuffer instance("thorinstance_");
StringBuffer instance("thorinstance_"); // only used when multiJobLinger = false (and lingerPeriod>0)

if (multiJobLinger)
{
Expand All @@ -1457,7 +1457,12 @@ void thorMain(ILogMsgHandler *logHandler, const char *wuid, const char *graphNam
thorQueue->connect(false);
}

queryMyNode()->endpoint().getEndpointHostText(instance);
if (!multiJobLinger && lingerPeriod)
{
// We avoid using getEndpointHostText here and get an IP instead, because the client pod communicating directly with this Thor manager,
// will not have the ability to resolve this pods hostname.
queryMyNode()->endpoint().getEndpointIpText(instance);
}
StringBuffer currentGraphName(graphName);
StringBuffer currentWuid(wuid);

Expand Down
Loading