Skip to content

Commit 271a27d

Browse files
committed
Bug#32776593 NOT ALL DATA NODE TO DATA NODE CONNECTIONS SEND HEART BEAT MESSAGING [3/3]
Add configuration parameter KeepAliveSendInterval. Zero disables sending keep alive signal. Values less than 10ms will be treated as 10ms. Change-Id: I1cbcc1128596ad2a30c3b886b00e549ede94ed3a
1 parent 6e4aab5 commit 271a27d

File tree

4 files changed

+24
-2
lines changed

4 files changed

+24
-2
lines changed

storage/ndb/include/mgmapi/mgmapi_config_parameters.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@
263263

264264
#define CFG_DB_NUM_CPUS 676
265265
#define CFG_DB_AUTO_THREAD_CONFIG 677
266+
#define CFG_DB_TRP_KEEP_ALIVE_SEND_INTERVAL 678
266267

267268
#define CFG_NODE_ARBIT_RANK 200
268269
#define CFG_NODE_ARBIT_DELAY 201

storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,15 @@ void Qmgr::initData()
112112
interface_check_timer.setDelay(1000);
113113
interface_check_timer.reset(now);
114114

115-
setTrpKeepAliveSendDelay(60*1000); // 1 minute
115+
Uint32 trp_keep_alive_send_interval = 60*1000; // 1 minute
116+
ndb_mgm_get_int_parameter(p, CFG_DB_TRP_KEEP_ALIVE_SEND_INTERVAL,
117+
&trp_keep_alive_send_interval);
118+
if (trp_keep_alive_send_interval > 0 &&
119+
trp_keep_alive_send_interval < 10)
120+
{
121+
trp_keep_alive_send_interval = 10;
122+
}
123+
setTrpKeepAliveSendDelay(trp_keep_alive_send_interval);
116124
c_keepalive_seqnum = 0;
117125

118126
#ifdef ERROR_INSERT

storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3568,7 +3568,8 @@ void Qmgr::timerHandlingLab(Signal* signal)
35683568
apiHbHandlingLab(signal, TcurrentTime);
35693569
}
35703570

3571-
if (ka_send_timer.check(TcurrentTime))
3571+
if (ka_send_timer.getDelay() > 0 &&
3572+
ka_send_timer.check(TcurrentTime))
35723573
{
35733574
jam();
35743575
ka_send_timer.reset(TcurrentTime);

storage/ndb/src/mgmsrv/ConfigInfo.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,6 +1130,18 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
11301130
"10",
11311131
STR_VALUE(MAX_INT_RNIL) },
11321132

1133+
{
1134+
CFG_DB_TRP_KEEP_ALIVE_SEND_INTERVAL,
1135+
"KeepAliveSendInterval",
1136+
DB_TOKEN,
1137+
"Time between sending keep alive signals on " DB_TOKEN_PRINT "-" DB_TOKEN_PRINT " links",
1138+
ConfigInfo::CI_USED,
1139+
0,
1140+
ConfigInfo::CI_INT,
1141+
"60000",
1142+
"0",
1143+
STR_VALUE(MAX_INT_RNIL) },
1144+
11331145
{
11341146
CFG_DB_CONNECT_CHECK_DELAY,
11351147
"ConnectCheckIntervalDelay",

0 commit comments

Comments
 (0)