loolwsd/LOOLWSD.cpp | 53 ++++++++++++++++++++++++++++++++++------------------
1 file changed, 35 insertions(+), 18 deletions(-)
New commits:
commit 4cec994c36736989681b4017c0fbec051b191f26
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Mon May 9 01:12:13 2016 -0400
loolwsd: auto-saving improvements
When multiple clients disconnect simultaniously
auto-save could fail.
Change-Id: I8a08e23d651674f43d30e8713fa2df0acccead15
Reviewed-on: https://gerrit.libreoffice.org/24786
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 48b8d05..d089501 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -618,7 +618,7 @@ private:
session = std::make_shared<MasterProcessSession>(id,
LOOLSession::Kind::ToClient, ws, docBroker, queue);
// Request the child to connect to us and add this session.
- const auto sessionsCount = docBroker->addSession(session);
+ auto sessionsCount = docBroker->addSession(session);
Log::trace(docKey + ", ws_sessions++: " +
std::to_string(sessionsCount));
// indicator to a client that is waiting to connect to lokit
process
@@ -648,29 +648,58 @@ private:
[&session]() { session->closeFrame(); },
[&queueHandlerThread]() { return TerminationFlag ||
!queueHandlerThread.isRunning(); });
- if (!session->_bLoadError)
{
+ std::unique_lock<std::mutex> docBrokersLock(docBrokersMutex);
+
+ // We can destory if this is the last session.
+ // If not, we have to remove the session and check again.
+ // Otherwise, we may end up removing the one and only session.
+ bool removedSession = false;
+ auto canDestroy = docBroker->canDestroy();
+ sessionsCount = docBroker->getSessionsCount();
+ if (sessionsCount > 1)
+ {
+ sessionsCount = docBroker->removeSession(id);
+ removedSession = true;
+ Log::trace(docKey + ", ws_sessions--: " +
std::to_string(sessionsCount));
+ canDestroy = docBroker->canDestroy();
+ }
+
// If we are the last, we must wait for the save to complete.
- const bool canDestroy = docBroker->canDestroy();
if (canDestroy)
{
Log::info("Shutdown of the last session, saving the
document before tearing down.");
}
- // Use auto-save to save only when there are modifications
since last save.
- // We also need to wait until the save notification reaches us
+ // We need to wait until the save notification reaches us
// and Storage persists the document.
if (!docBroker->autoSave(canDestroy, COMMAND_TIMEOUT_MS))
{
Log::error("Auto-save before closing failed.");
}
+
+ if (!removedSession)
+ {
+ sessionsCount = docBroker->removeSession(id);
+ Log::trace(docKey + ", ws_sessions--: " +
std::to_string(sessionsCount));
+ }
}
- else
+
+ if (session->_bLoadError)
{
Log::info("Clearing the queue.");
queue->clear();
}
+ if (sessionsCount == 0)
+ {
+ std::unique_lock<std::mutex> docBrokersLock(docBrokersMutex);
+ Log::debug("Removing DocumentBroker for docKey [" + docKey +
"].");
+ docBrokers.erase(docKey);
+ Log::info("Removing complete doc [" + docKey + "] from
Admin.");
+ Admin::instance().rmDoc(docKey);
+ }
+
Log::info("Finishing GET request handler for session [" + id + "].
Joining the queue.");
queue->put("eof");
queueHandlerThread.join();
@@ -680,18 +709,6 @@ private:
Log::error("Error in client request handler: " +
std::string(exc.what()));
}
- docBrokersLock.lock();
- const auto sessionsCount = docBroker->removeSession(id);
- Log::trace(docKey + ", ws_sessions--: " +
std::to_string(sessionsCount));
- if (sessionsCount == 0)
- {
- Log::debug("Removing DocumentBroker for docKey [" + docKey + "].");
- docBrokers.erase(docKey);
- Log::info("Removing complete doc [" + docKey + "] from Admin.");
- Admin::instance().rmDoc(docKey);
- }
- docBrokersLock.unlock();
-
if (session->isCloseFrame())
{
Log::trace("Normal close handshake.");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
