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

Add restart of ES during backup recovery

Browse source
This commit is contained in:
Ryan Huffman 2018-02-15 11:49:05 -08:00 committed by Atlante45
parent f67931c936
commit 9e99c5c744
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/src/DomainServer.cpp
View file

@ -1785,6 +1785,8 @@ QString DomainServer::getEntitiesReplacementFilePath() {
void DomainServer::processOctreeDataRequestMessage(QSharedPointer<ReceivedMessage> message) { void DomainServer::processOctreeDataRequestMessage(QSharedPointer<ReceivedMessage> message) {
qDebug() << "Got request for octree data from " << message->getSenderSockAddr(); qDebug() << "Got request for octree data from " << message->getSenderSockAddr();
maybeHandleReplacementEntityFile();
bool remoteHasExistingData { false }; bool remoteHasExistingData { false };
QUuid id; QUuid id;
int version; int version;

9
domain-server/src/EntitiesBackupHandler.cpp
View file

@ -16,6 +16,7 @@
#include <quazip5/quazip.h> #include <quazip5/quazip.h>
#include <quazip5/quazipfile.h> #include <quazip5/quazipfile.h>
#include <LimitedNodeList.h>
#include <OctreeUtils.h> #include <OctreeUtils.h>
EntitiesBackupHandler::EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) : EntitiesBackupHandler::EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) :
@ -71,5 +72,13 @@ void EntitiesBackupHandler::recoverBackup(QuaZip& zip) {
if (entitiesFile.open(QIODevice::WriteOnly)) { if (entitiesFile.open(QIODevice::WriteOnly)) {
entitiesFile.write(data.toGzippedByteArray()); entitiesFile.write(data.toGzippedByteArray());
entitiesFile.close();
auto nodeList = DependencyManager::get<LimitedNodeList>();
nodeList->eachMatchingNode([](const SharedNodePointer& otherNode) -> bool {
return otherNode->getType() == NodeType::EntityServer;
}, [nodeList](const SharedNodePointer& otherNode) {
QMetaObject::invokeMethod(nodeList.data(), "killNodeWithUUID", Q_ARG(const QUuid&, otherNode->getUUID()));
});
} }
} }