Skip to content

Commit

Permalink
Merge pull request #19149 from jakesmith/HPCC-32720-fix-multiJobLinge…
Browse files Browse the repository at this point in the history
…r-false

HPCC-32720 Fix multiJobLinger=false configurations

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>
  • Loading branch information
ghalliday authored Oct 3, 2024
2 parents ed5c7f0 + feb6a2d commit 9a27571
Showing 1 changed file with 7 additions and 2 deletions.
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

0 comments on commit 9a27571

Please sign in to comment.