Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 23:09:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16309 from SimonWalton-HiFi/assignment-client-logging-for-paging

Browse source 
DEV-2329: Identify Alerting requirements for Assignment Client reliable operation
This commit is contained in:
Howard Stearns 2019-10-08 15:35:22 -07:00 committed by GitHub
commit 9d17c32ff4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
assignment-client/src/AssignmentClient.cpp
View file

@ -82,6 +82,9 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
} }
_assignmentServerSocket = HifiSockAddr(_assignmentServerHostname, assignmentServerPort, true); _assignmentServerSocket = HifiSockAddr(_assignmentServerHostname, assignmentServerPort, true);
if (_assignmentServerSocket.isNull()) {
qCCritical(assignment_client) << "PAGE: Couldn't resolve domain server address" << _assignmentServerHostname;
}
_assignmentServerSocket.setObjectName("AssignmentServer"); _assignmentServerSocket.setObjectName("AssignmentServer");
nodeList->setAssignmentServerSocket(_assignmentServerSocket); nodeList->setAssignmentServerSocket(_assignmentServerSocket);
@ -183,16 +186,21 @@ void AssignmentClient::sendAssignmentRequest() {
// we want to check again for the local domain-server port in case the DS has restarted // we want to check again for the local domain-server port in case the DS has restarted
quint16 localAssignmentServerPort; quint16 localAssignmentServerPort;
if (nodeList->getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, localAssignmentServerPort)) { if (nodeList->getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, localAssignmentServerPort)) {
if (localAssignmentServerPort != _assignmentServerSocket.getPort()) { if (localAssignmentServerPort == 0) {
qCDebug(assignment_client) << "Port for local assignment server read from shared memory is" qCWarning(assignment_client) << "ALERT: Server port from shared memory is 0";
<< localAssignmentServerPort; } else {
if (localAssignmentServerPort != _assignmentServerSocket.getPort()) {
qCDebug(assignment_client) << "Port for local assignment server read from shared memory is"
<< localAssignmentServerPort;
_assignmentServerSocket.setPort(localAssignmentServerPort); _assignmentServerSocket.setPort(localAssignmentServerPort);
nodeList->setAssignmentServerSocket(_assignmentServerSocket); nodeList->setAssignmentServerSocket(_assignmentServerSocket);
}
} }
} else { } else {
qCWarning(assignment_client) << "Failed to read local assignment server port from shared memory" qCWarning(assignment_client) << "ALERT: Failed to read local assignment server port from shared memory ("
<< "- will send assignment request to previous assignment server socket."; << DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY
<< ")- will send assignment request to previous assignment server socket.";
} }
} }
@ -250,7 +258,7 @@ void AssignmentClient::handleCreateAssignmentPacket(QSharedPointer<ReceivedMessa
// Starts an event loop, and emits workerThread->started() // Starts an event loop, and emits workerThread->started()
workerThread->start(); workerThread->start();
} else { } else {
qCWarning(assignment_client) << "Received an assignment that could not be unpacked. Re-requesting."; qCWarning(assignment_client) << "ALERT: Received an assignment that could not be unpacked. Re-requesting.";
} }
} }

4
assignment-client/src/AssignmentFactory.cpp
View file

@ -24,7 +24,9 @@
ThreadedAssignment* AssignmentFactory::unpackAssignment(ReceivedMessage& message) { ThreadedAssignment* AssignmentFactory::unpackAssignment(ReceivedMessage& message) {
quint8 packedType; quint8 packedType;
message.peekPrimitive(&packedType); if (message.peekPrimitive(&packedType) != sizeof(packedType)) {
return nullptr;
}
Assignment::Type unpackedType = (Assignment::Type) packedType; Assignment::Type unpackedType = (Assignment::Type) packedType;

6
libraries/networking/src/LimitedNodeList.cpp
View file

@ -1329,7 +1329,8 @@ void LimitedNodeList::putLocalPortIntoSharedMemory(const QString key, QObject* p
qCDebug(networking) << "Wrote local listening port" << localPort << "to shared memory at key" << key; qCDebug(networking) << "Wrote local listening port" << localPort << "to shared memory at key" << key;
} else { } else {
qWarning() << "ALERT: Failed to create and attach to shared memory to share local port with assignment-client children."; qWarning() << "ALERT: Failed to create and attach to shared memory to share local port with assignment-client children:"
<< sharedPortMem->errorString();
} }
} }
@ -1337,7 +1338,8 @@ void LimitedNodeList::putLocalPortIntoSharedMemory(const QString key, QObject* p
bool LimitedNodeList::getLocalServerPortFromSharedMemory(const QString key, quint16& localPort) { bool LimitedNodeList::getLocalServerPortFromSharedMemory(const QString key, quint16& localPort) {
QSharedMemory sharedMem(key); QSharedMemory sharedMem(key);
if (!sharedMem.attach(QSharedMemory::ReadOnly)) { if (!sharedMem.attach(QSharedMemory::ReadOnly)) {
qCWarning(networking) << "Could not attach to shared memory at key" << key; qCWarning(networking) << "Could not attach to shared memory at key" << key
<< ":" << sharedMem.errorString();
return false; return false;
} else { } else {
sharedMem.lock(); sharedMem.lock();