summaryrefslogtreecommitdiff
path: root/src/server/database/Database/DatabaseLoader.cpp
diff options
context:
space:
mode:
authorKargatum <dowlandtop@yandex.com>2021-06-27 23:59:44 +0700
committerGitHub <noreply@github.com>2021-06-27 18:59:44 +0200
commit2d2857ce81db5297eb63d388d2e2f252ef52412d (patch)
tree93455f25b00358326cb6d73bd1b454d45cd95d26 /src/server/database/Database/DatabaseLoader.cpp
parentccd73918aed62456af4cf900c59b2d8108a24d81 (diff)
feat(Core/DBUpdater): implement db auto update (#6576)
* feat(Core/DBUpdater): implement db auto update * 1 * 2 * 3 * Some minor improvements * add find bin for mysql 8.0 * lic Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com>
Diffstat (limited to 'src/server/database/Database/DatabaseLoader.cpp')
-rw-r--r--src/server/database/Database/DatabaseLoader.cpp62
1 files changed, 56 insertions, 6 deletions
diff --git a/src/server/database/Database/DatabaseLoader.cpp b/src/server/database/Database/DatabaseLoader.cpp
index b18cc1401c..7d3275d50b 100644
--- a/src/server/database/Database/DatabaseLoader.cpp
+++ b/src/server/database/Database/DatabaseLoader.cpp
@@ -5,22 +5,26 @@
#include "DatabaseLoader.h"
#include "Config.h"
-// #include "DBUpdater.h" not implement
+#include "DBUpdater.h"
#include "DatabaseEnv.h"
#include "Duration.h"
#include "Log.h"
-#include "Duration.h"
#include <errmsg.h>
#include <mysqld_error.h>
#include <thread>
-DatabaseLoader::DatabaseLoader(std::string const& logger)
- : _logger(logger) { }
+DatabaseLoader::DatabaseLoader(std::string const& logger, uint32 const defaultUpdateMask)
+ : _logger(logger), _autoSetup(sConfigMgr->GetOption<bool>("Updates.AutoSetup", true)),
+ _updateFlags(sConfigMgr->GetOption<uint32>("Updates.EnableDatabases", defaultUpdateMask))
+{
+}
template <class T>
DatabaseLoader& DatabaseLoader::AddDatabase(DatabaseWorkerPool<T>& pool, std::string const& name)
{
- _open.push([this, name, &pool]() -> bool
+ bool const updatesEnabledForThis = DBUpdater<T>::IsEnabled(_updateFlags);
+
+ _open.push([this, name, updatesEnabledForThis, &pool]() -> bool
{
std::string const dbString = sConfigMgr->GetOption<std::string>(name + "DatabaseInfo", "");
if (dbString.empty())
@@ -67,6 +71,16 @@ DatabaseLoader& DatabaseLoader::AddDatabase(DatabaseWorkerPool<T>& pool, std::st
}
}
+ // Database does not exist
+ if ((error == ER_BAD_DB_ERROR) && updatesEnabledForThis && _autoSetup && !sConfigMgr->isDryRun())
+ {
+ // Try to create the database and connect again if auto setup is enabled
+ if (DBUpdater<T>::Create(pool) && (!pool.Open()))
+ {
+ error = 0;
+ }
+ }
+
// If the error wasn't handled quit
if (error)
{
@@ -85,6 +99,32 @@ DatabaseLoader& DatabaseLoader::AddDatabase(DatabaseWorkerPool<T>& pool, std::st
return true;
});
+ // Populate and update only if updates are enabled for this pool
+ if (updatesEnabledForThis && !sConfigMgr->isDryRun())
+ {
+ _populate.push([this, name, &pool]() -> bool
+ {
+ if (!DBUpdater<T>::Populate(pool))
+ {
+ LOG_ERROR(_logger, "Could not populate the %s database, see log for details.", name.c_str());
+ return false;
+ }
+
+ return true;
+ });
+
+ _update.push([this, name, &pool]() -> bool
+ {
+ if (!DBUpdater<T>::Update(pool))
+ {
+ LOG_ERROR(_logger, "Could not update the %s database, see log for details.", name.c_str());
+ return false;
+ }
+
+ return true;
+ });
+ }
+
_prepare.push([this, name, &pool]() -> bool
{
if (!pool.PrepareStatements())
@@ -101,7 +141,7 @@ DatabaseLoader& DatabaseLoader::AddDatabase(DatabaseWorkerPool<T>& pool, std::st
bool DatabaseLoader::Load()
{
- return OpenDatabases() && PrepareStatements();
+ return OpenDatabases() && PopulateDatabases() && UpdateDatabases() && PrepareStatements();
}
bool DatabaseLoader::OpenDatabases()
@@ -109,6 +149,16 @@ bool DatabaseLoader::OpenDatabases()
return Process(_open);
}
+bool DatabaseLoader::PopulateDatabases()
+{
+ return Process(_populate);
+}
+
+bool DatabaseLoader::UpdateDatabases()
+{
+ return Process(_update);
+}
+
bool DatabaseLoader::PrepareStatements()
{
return Process(_prepare);