Merge pull request #7157 from Icinga/bugfix/ido-conn-prevent-deactiva…

…te-on-reload DB IDO: Do not deactivate objects during application reload/restart
Icinga · May 3, 2019 · 7dfd353 · 7dfd353
2 parents 759b090 + 78e24c5
commit 7dfd353
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/lib/base/application.cpp b/lib/base/application.cpp
@@ -353,6 +353,11 @@ bool Application::IsShuttingDown()
 	return m_ShuttingDown;
 }
 
+bool Application::IsRestarting()
+{
+	return l_Restarting;
+}
+
 void Application::OnShutdown()
 {
 	/* Nothing to do here. */

diff --git a/lib/base/application.hpp b/lib/base/application.hpp
@@ -58,6 +58,7 @@ class Application : public ObjectImpl<Application> {
 	static void RequestReopenLogs();
 
 	static bool IsShuttingDown();
+	static bool IsRestarting();
 
 	static void SetDebuggingSeverity(LogSeverity severity);
 	static LogSeverity GetDebuggingSeverity();

diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp
@@ -375,7 +375,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);
@@ -402,7 +421,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);