Skip to content

Commit 9224e06

Browse files
committed
Bug#35389533 Backup won't start with NOWAIT option after restarting a data node
Post-push fix: guess_master_node function changed to, after unsuccessfully tried to guess the master node based on dynamicId, check for any connected node. Change-Id: Id0cd86196df88a16ca1254fb126e8b71f76443a3
1 parent cf7728b commit 9224e06

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

storage/ndb/src/mgmsrv/MgmtSrvr.cpp

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,24 +1449,17 @@ MgmtSrvr::guess_master_node(SignalSender& ss)
14491449
return guess;
14501450

14511451
/**
1452-
* Check connected nodes based on dynamicId
1452+
* Check any connected node
14531453
*/
14541454
node_id = 0;
14551455
while(getNextNodeId(&node_id, NDB_MGM_NODE_TYPE_NDB))
14561456
{
14571457
trp_node node = ss.getNodeInfo(node_id);
1458-
if(node.m_state.dynamicId < min)
1458+
if (node.is_connected())
14591459
{
1460-
if(node.is_connected())
1461-
{
1462-
min = node.m_state.dynamicId;
1463-
guess = node_id;
1464-
}
1460+
return node_id;
14651461
}
14661462
}
1467-
//found
1468-
if(min < UINT32_MAX)
1469-
return guess;
14701463

14711464
return 0; // give up
14721465
}

0 commit comments

Comments
 (0)