Skip to content

Commit

Permalink
Merge pull request #18138 from richardkchapman/toposerverHeartbeat
Browse files Browse the repository at this point in the history
HPCC-31010 Incorrect default value for toposerver.heartbeatInterval

Reviewed-by: Mark Kelly [email protected]
Reviewed-by: Gavin Halliday <[email protected]>
Merged-by: Gavin Halliday <[email protected]>
  • Loading branch information
ghalliday authored Dec 14, 2023
2 parents 133f7c9 + 14b612d commit 6d0436a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions roxie/topo/toposerver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ unsigned lastTimeoutCheck = 0;
unsigned lastTopologyReport = 0;

unsigned timeoutCheckInterval = 1000; // How often we check to see what has expired
unsigned heartbeatInterval = 5000; // How often nodes send heartbeats
unsigned heartbeatInterval = 10000; // How often nodes send heartbeats
unsigned timeoutHeartbeatServer = 60000; // How long before a server is marked as down
unsigned timeoutHeartbeatAgent = 10000; // How long before an agent is marked as down
unsigned timeoutHeartbeatAgent = 20000; // How long before an agent is marked as down
unsigned removeHeartbeatInterval = 120000; // How long before a node is removed from list
unsigned topologyReportInterval = 60000; // How often topology is reported to logging (if traceLevel >= 2)
bool aborted = false;
Expand Down
2 changes: 1 addition & 1 deletion roxie/udplib/udptopo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ extern UDPLIB_API void createStaticTopology(const std::vector<RoxieEndpointInfo>

static std::thread topoThread;
static Semaphore abortTopo;
unsigned heartbeatInterval = 5000; // How often roxie servers update topo server
unsigned heartbeatInterval = 10000; // How often roxie servers update topo server

extern UDPLIB_API void initializeTopology(const StringArray &topoValues, const std::vector<RoxieEndpointInfo> &myRoles)
{
Expand Down

0 comments on commit 6d0436a

Please sign in to comment.