Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Case 20106-AC agents spawned with -n don't come back

Browse source 
with the expected amount after a domain restart

They were being incorrectly marked as 'unassigned' in the
assignment client monitor.
This commit is contained in:
Roxanne Skelly 2018-12-18 16:33:13 -08:00
parent 1977180ecf
commit 4c1ba8b1aa
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assignment-client/src/AssignmentClientMonitor.cpp
View file

@ -276,6 +276,7 @@ void AssignmentClientMonitor::checkSpares() {
// Spawn or kill children, as needed. If --min or --max weren't specified, allow the child count // Spawn or kill children, as needed. If --min or --max weren't specified, allow the child count
// to drift up or down as far as needed. // to drift up or down as far as needed.
if (spareCount < 1 || totalCount < _minAssignmentClientForks) { if (spareCount < 1 || totalCount < _minAssignmentClientForks) {
if (!_maxAssignmentClientForks || totalCount < _maxAssignmentClientForks) { if (!_maxAssignmentClientForks || totalCount < _maxAssignmentClientForks) {
spawnChildClient(); spawnChildClient();
@ -316,9 +317,9 @@ void AssignmentClientMonitor::handleChildStatusPacket(QSharedPointer<ReceivedMes
matchingNode = DependencyManager::get<LimitedNodeList>()->addOrUpdateNode(senderID, NodeType::Unassigned, matchingNode = DependencyManager::get<LimitedNodeList>()->addOrUpdateNode(senderID, NodeType::Unassigned,
senderSockAddr, senderSockAddr); senderSockAddr, senderSockAddr);
auto childData = std::unique_ptr<AssignmentClientChildData> auto newChildData = std::unique_ptr<AssignmentClientChildData>
{ new AssignmentClientChildData(Assignment::Type::AllTypes) }; { new AssignmentClientChildData(Assignment::Type::AllTypes) };
matchingNode->setLinkedData(std::move(childData)); matchingNode->setLinkedData(std::move(newChildData));
} else { } else {
// tell unknown assignment-client child to exit. // tell unknown assignment-client child to exit.
qDebug() << "Asking unknown child at" << senderSockAddr << "to exit."; qDebug() << "Asking unknown child at" << senderSockAddr << "to exit.";
@ -329,9 +330,8 @@ void AssignmentClientMonitor::handleChildStatusPacket(QSharedPointer<ReceivedMes
return; return;
} }
} }
} else {
childData = dynamic_cast<AssignmentClientChildData*>(matchingNode->getLinkedData());
} }
childData = dynamic_cast<AssignmentClientChildData*>(matchingNode->getLinkedData());
if (childData) { if (childData) {
// update our records about how to reach this child // update our records about how to reach this child