strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

wsd: merge idle document killing with document cleanup

Browse source 
Since we already enumerate the DocumentBrokers and
remove dead ones before every autosave (every 30 seconds)
as well as when loading/unloading documents, there
is little reason to have a separate timeout and loop
for idle documents.

In addition, the previous code only killed the child
but didn't remove the dead DocumentBroker entry from
DocBrokers. Not clear if this was intentional, but it
would have been removed on the next cleanup anyway.

Change-Id: Ie1e09c77133165dd1255930b0b0be06fde7646b1
Reviewed-on: https://gerrit.libreoffice.org/32626
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian 2017-01-01 17:31:49 -05:00 committed by Ashod Nakashian
parent 94b2262e27
commit a4868edb41
1 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
wsd/LOOLWSD.cpp
View file

@ -260,7 +260,8 @@ void alertAllUsersInternal(const std::string& msg)
}
}
/// Remove dead DocBrokers.
/// Remove dead and idle DocBrokers.
/// The client of idle document should've greyed-out long ago.
/// Returns true if at least one is removed.
bool cleanupDocBrokers()
{
@ -272,11 +273,15 @@ bool cleanupDocBrokers()
auto docBroker = it->second;
auto lock = docBroker->getLock();
// Remove idle documents after 1 hour.
const bool idle = (docBroker->getIdleTime() >= 3600);
// Cleanup used and dead entries.
if (docBroker->isLoaded() &&
(docBroker->getSessionsCount() == 0 || !docBroker->isAlive()))
(docBroker->getSessionsCount() == 0 || !docBroker->isAlive() || idle))
{
LOG_DBG("Removing dead DocumentBroker for docKey [" << it->first << "].");
LOG_INF("Removing " << (idle ? "idle" : "dead") <<
" DocumentBroker for docKey [" << it->first << "].");
it = DocBrokers.erase(it);
docBroker->terminateChild(lock);
}
@ -2086,7 +2091,6 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
#endif
time_t last30SecCheck = time(nullptr);
time_t lastOneHourCheck = time(nullptr);
int status = 0;
while (!TerminationFlag && !SigUtil::isShuttingDown())
{
@ -2188,30 +2192,6 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
last30SecCheck = time(nullptr);
}
else if (time(nullptr) >= lastOneHourCheck + 900) // Every 15 minutes
{
// Bluntly close documents that have been idle over an hour. (By that time
// loleaflet's greying-out has already also kicked in.)
try
{
std::unique_lock<std::mutex> docBrokersLock(DocBrokersMutex);
for (auto& pair : DocBrokers)
{
auto docLock = pair.second->getLock();
if (pair.second->getIdleTime() >= 3600)
{
LOG_INF("Terminating idle document " + pair.second->getDocKey());
pair.second->terminateChild(docLock);
}
}
}
catch (const std::exception& exc)
{
LOG_ERR("Exception: " << exc.what());
}
lastOneHourCheck = time(nullptr);
}
else
{
// Wait if we had done no work.