tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DB IDO: Do not deactivate objects during application reload/restart 

This follows the same principle as with the shutdown handler,
and was introduced with the changed reload handling with 2.9.
Previously IsShuttingDown() was sufficient which got set at one
location.

SigUsr2 as handler introduced a new location where m_ShuttingDown
is not necessarily set yet. Since this handler gets called when
l_Restarting is enabled, we'll use this flag to avoid config update
events resulting in object deactivation (object->IsActive() always
returns false).

refs #5996
refs #6691
refs #6970

fixes #7125

(cherry picked from commit 78e24c53f1)
This commit is contained in:
Michael Friedrich 2019-05-03 12:44:29 +02:00
parent 553bc54297
commit d0ac7f464d
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/base/application.cpp
View File

@ -374,6 +374,11 @@ bool Application::IsShuttingDown()
return m_ShuttingDown;
}
bool Application::IsRestarting()
{
return l_Restarting;
}
void Application::OnShutdown()
{
/* Nothing to do here. */

1
lib/base/application.hpp
View File

@ -75,6 +75,7 @@ public:
static void RequestReopenLogs();
static bool IsShuttingDown();
static bool IsRestarting();
static void SetDebuggingSeverity(LogSeverity severity);
static LogSeverity GetDebuggingSeverity();

26
lib/db_ido/dbconnection.cpp
View File

@ -392,7 +392,26 @@ bool DbConnection::GetStatusUpdate(const DbObject::Ptr& dbobj) const
void DbConnection::UpdateObject(const ConfigObject::Ptr& object)
{
if (!GetConnected() || Application::IsShuttingDown())
bool isShuttingDown = Application::IsShuttingDown();
bool isRestarting = Application::IsRestarting();
#ifdef I2_DEBUG
if (isShuttingDown || isRestarting) {
//Log(LogDebug, "DbConnection")
// << "Updating object '" << object->GetName() << "' \t\t active '" << Convert::ToLong(object->IsActive())
// << "' shutting down '" << Convert::ToLong(isShuttingDown) << "' restarting '" << Convert::ToLong(isRestarting) << "'.";
}
#endif /* I2_DEBUG */
/* Wait until a database connection is established on reconnect. */
if (!GetConnected())
return;
/* Don't update inactive objects during shutdown/reload/restart.
* They would be marked as deleted. This gets triggered with ConfigObject::StopObjects().
* During startup/reconnect this is fine, the handler is not active there.
*/
if (isShuttingDown || isRestarting)
return;
DbObject::Ptr dbobj = DbObject::GetOrCreateByObject(object);
@ -419,7 +438,10 @@ void DbConnection::UpdateObject(const ConfigObject::Ptr& object)
dbobj->SendConfigUpdateLight();
}
} else if (!active) {
/* Deactivate the deleted object no matter
/* This may happen on reload/restart actions too
* and is blocked above already.
*
* Deactivate the deleted object no matter
* which state it had in the database.
*/
DeactivateObject(dbobj);