tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 06:34:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for using the 1.12.0 IDO database schema

Browse Source 
fixes #8689
This commit is contained in:
Gunnar Beutner 2015-03-12 09:35:26 +01:00
parent 05c237c780
commit 94fde1a6b2
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/db_ido/dbconnection.hpp
View File

@ -27,6 +27,9 @@
#include "base/timer.hpp" #include "base/timer.hpp"
#include <boost/thread/once.hpp> #include <boost/thread/once.hpp>
#define IDO_CURRENT_SCHEMA_VERSION "1.13.0"
#define IDO_COMPAT_SCHEMA_VERSION "1.12.0"
namespace icinga namespace icinga
{ {

14
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -34,8 +34,6 @@
using namespace icinga; using namespace icinga;
#define SCHEMA_VERSION "1.13.0"
REGISTER_TYPE(IdoMysqlConnection); REGISTER_TYPE(IdoMysqlConnection);
REGISTER_STATSFUNCTION(IdoMysqlConnectionStats, &IdoMysqlConnection::StatsFunc); REGISTER_STATSFUNCTION(IdoMysqlConnectionStats, &IdoMysqlConnection::StatsFunc);
@ -51,7 +49,7 @@ void IdoMysqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::P
size_t items = idomysqlconnection->m_QueryQueue.GetLength(); size_t items = idomysqlconnection->m_QueryQueue.GetLength();
Dictionary::Ptr stats = new Dictionary(); Dictionary::Ptr stats = new Dictionary();
stats->Set("version", SCHEMA_VERSION); stats->Set("version", IDO_CURRENT_SCHEMA_VERSION);
stats->Set("instance_name", idomysqlconnection->GetInstanceName()); stats->Set("instance_name", idomysqlconnection->GetInstanceName());
stats->Set("query_queue_items", items); stats->Set("query_queue_items", items);
@ -223,6 +221,9 @@ void IdoMysqlConnection::Reconnect(void)
Dictionary::Ptr row = FetchRow(result); Dictionary::Ptr row = FetchRow(result);
if (!row) { if (!row) {
mysql_close(&m_Connection);
m_Connected = false;
Log(LogCritical, "IdoMysqlConnection", "Schema does not provide any valid version! Verify your schema installation."); Log(LogCritical, "IdoMysqlConnection", "Schema does not provide any valid version! Verify your schema installation.");
Application::RequestShutdown(EXIT_FAILURE); Application::RequestShutdown(EXIT_FAILURE);
@ -233,10 +234,13 @@ void IdoMysqlConnection::Reconnect(void)
String version = row->Get("version"); String version = row->Get("version");
if (Utility::CompareVersion(SCHEMA_VERSION, version) < 0) { if (Utility::CompareVersion(IDO_COMPAT_SCHEMA_VERSION, version) < 0) {
mysql_close(&m_Connection);
m_Connected = false;
Log(LogCritical, "IdoMysqlConnection") Log(LogCritical, "IdoMysqlConnection")
<< "Schema version '" << version << "' does not match the required version '" << "Schema version '" << version << "' does not match the required version '"
<< SCHEMA_VERSION << "'! Please check the upgrade documentation."; << IDO_COMPAT_SCHEMA_VERSION << "' (or newer)! Please check the upgrade documentation.";
Application::RequestShutdown(EXIT_FAILURE); Application::RequestShutdown(EXIT_FAILURE);
return; return;

8
lib/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -35,8 +35,6 @@
using namespace icinga; using namespace icinga;
#define SCHEMA_VERSION "1.13.0"
REGISTER_TYPE(IdoPgsqlConnection); REGISTER_TYPE(IdoPgsqlConnection);
REGISTER_STATSFUNCTION(IdoPgsqlConnectionStats, &IdoPgsqlConnection::StatsFunc); REGISTER_STATSFUNCTION(IdoPgsqlConnectionStats, &IdoPgsqlConnection::StatsFunc);
@ -53,7 +51,7 @@ void IdoPgsqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::P
size_t items = idopgsqlconnection->m_QueryQueue.GetLength(); size_t items = idopgsqlconnection->m_QueryQueue.GetLength();
Dictionary::Ptr stats = new Dictionary(); Dictionary::Ptr stats = new Dictionary();
stats->Set("version", SCHEMA_VERSION); stats->Set("version", IDO_CURRENT_SCHEMA_VERSION);
stats->Set("instance_name", idopgsqlconnection->GetInstanceName()); stats->Set("instance_name", idopgsqlconnection->GetInstanceName());
stats->Set("query_queue_items", items); stats->Set("query_queue_items", items);
@ -234,13 +232,13 @@ void IdoPgsqlConnection::Reconnect(void)
String version = row->Get("version"); String version = row->Get("version");
if (Utility::CompareVersion(SCHEMA_VERSION, version) < 0) { if (Utility::CompareVersion(IDO_COMPAT_SCHEMA_VERSION, version) < 0) {
PQfinish(m_Connection); PQfinish(m_Connection);
m_Connection = NULL; m_Connection = NULL;
Log(LogCritical, "IdoPgsqlConnection") Log(LogCritical, "IdoPgsqlConnection")
<< "Schema version '" << version << "' does not match the required version '" << "Schema version '" << version << "' does not match the required version '"
<< SCHEMA_VERSION << "'! Please check the upgrade documentation."; << IDO_COMPAT_SCHEMA_VERSION << "' (or newer)! Please check the upgrade documentation.";
Application::RequestShutdown(EXIT_FAILURE); Application::RequestShutdown(EXIT_FAILURE);
return; return;