nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-06 04:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Database): Gracefully close database workers (#20936)

Browse Source 
* Gracefully close database workers

* Change init order. Such a silly compiler flag

* Fix hang if db connection failed to open
This commit is contained in:
Takenbacon
2024-12-18 11:24:17 -08:00
committed by GitHub
parent c8734af4bc
commit a23b13defe
5 changed files with 21 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/database/Database/DatabaseWorker.cpp
View File

@@ -23,16 +23,11 @@ DatabaseWorker::DatabaseWorker(ProducerConsumerQueue<SQLOperation*>* newQueue, M
{
_connection = connection;
_queue = newQueue;
_cancelationToken = false;
_workerThread = std::thread(&DatabaseWorker::WorkerThread, this);
}
DatabaseWorker::~DatabaseWorker()
{
_cancelationToken = true;
_queue->Cancel();
_workerThread.join();
}
@@ -47,7 +42,7 @@ void DatabaseWorker::WorkerThread()
_queue->WaitAndPop(operation);
if (_cancelationToken || !operation)
if (!operation)
return;
operation->SetConnection(_connection);

2
src/server/database/Database/DatabaseWorker.h
View File

@@ -41,8 +41,6 @@ private:
void WorkerThread();
std::thread _workerThread;
std::atomic<bool> _cancelationToken;
DatabaseWorker(DatabaseWorker const& right) = delete;
DatabaseWorker& operator=(DatabaseWorker const& right) = delete;
};

7
src/server/database/Database/DatabaseWorkerPool.cpp
View File

@@ -112,7 +112,11 @@ uint32 DatabaseWorkerPool<T>::Open()
template <class T>
void DatabaseWorkerPool<T>::Close()
{
LOG_INFO("sql.driver", "Closing down DatabasePool '{}'.", GetDatabaseName());
LOG_INFO("sql.driver", "Closing down DatabasePool '{}'. Waiting for {} queries to finish...", GetDatabaseName(), _queue->Size());
// Gracefully close async query queue, worker threads will block when the destructor
// is called from the .clear() functions below until the queue is empty
_queue->Shutdown();
//! Closes the actualy MySQL connection.
_connections[IDX_ASYNC].clear();
@@ -432,6 +436,7 @@ uint32 DatabaseWorkerPool<T>::OpenConnections(InternalIndex type, uint8 numConne
if (uint32 error = connection->Open())
{
// Failed to open a connection or invalid version, abort and cleanup
_queue->Cancel();
_connections[type].clear();
return error;
}

35
src/server/game/World/World.cpp
View File

@@ -95,11 +95,6 @@
#include <boost/asio/ip/address.hpp>
#include <cmath>
namespace
{
TaskScheduler playersSaveScheduler;
}
std::atomic_long World::_stopEvent = false;
uint8 World::_exitCode = SHUTDOWN_EXIT_CODE;
uint32 World::m_worldLoopCounter = 0;
@@ -2497,11 +2492,6 @@ void World::Update(uint32 diff)
sScriptMgr->OnWorldUpdate(diff);
}
{
METRIC_TIMER("world_update_time", METRIC_TAG("type", "Update playersSaveScheduler"));
playersSaveScheduler.Update(diff);
}
{
METRIC_TIMER("world_update_time", METRIC_TAG("type", "Update metrics"));
// Stats logger update
@@ -2691,31 +2681,6 @@ void World::ShutdownServ(uint32 time, uint32 options, uint8 exitcode, const std:
_shutdownMask = options;
_exitCode = exitcode;
auto const& playersOnline = GetActiveSessionCount();
if (time < 5 && playersOnline)
{
// Set time to 5s for save all players
time = 5;
}
playersSaveScheduler.CancelAll();
if (time >= 5)
{
playersSaveScheduler.Schedule(Seconds(time - 5), [this](TaskContext /*context*/)
{
if (!GetActiveSessionCount())
{
LOG_INFO("server", "> No players online. Skip save before shutdown");
return;
}
LOG_INFO("server", "> Save players before shutdown server");
ObjectAccessor::SaveAllPlayers();
});
}
LOG_WARN("server", "Time left until shutdown/restart: {}", time);
///- If the shutdown time is 0, set m_stopEvent (except if shutdown is 'idle' with remaining sessions)