Track deleted runtime objects to avaóid erroneous recreation

Author: jschmidt-icinga

lib/icinga/icingaapplication.cpp

@@ -19,8 +19,7 @@
 #include "base/scriptglobal.hpp"
 #include "base/initialize.hpp"
 #include "base/statsfunction.hpp"
-#include "base/loader.hpp"
-#include <fstream>
+#include "remote/apilistener.hpp"
 
 using namespace icinga;
 
@@ -162,6 +161,7 @@ static void PersistModAttrHelper(AtomicFile& fp, ConfigObject::Ptr& previousObje
 
 void IcingaApplication::DumpProgramState()
 {
+	ApiListener::GetInstance()->PruneDeletedRuntimeObjects();
 	ConfigObject::DumpObjects(Configuration::StatePath);
 	DumpModifiedAttributes();
 }

lib/remote/apilistener-configsync.cpp

@@ -98,6 +98,16 @@ Value ApiListener::ConfigUpdateObjectAPIHandler(const MessageOrigin::Ptr& origin
 	/* update the object */
 	double objVersion = params->Get("version");
 
+	auto deletedRuntimeObjects = listener->GetDeletedRuntimeObjects();
+	Dictionary::Ptr deletedInfo = deletedRuntimeObjects->Get(objName);
+
+	if (deletedInfo && deletedInfo->Get("version") >= objVersion) {
+		Log(LogWarning, "ApiListener")
+			<< "Ignoring config update for deleted object '" << objName << "' of type '" << objType << "' from '"
+			<< identity << "' (endpoint: '" << endpoint->GetName() << "', zone: '" << endpointZone->GetName() << "')";
+		return Empty;
+	}
+
 	Type::Ptr ptype = Type::GetByName(objType);
 	auto *ctype = dynamic_cast<ConfigType *>(ptype.get());
 
@@ -437,6 +447,12 @@ void ApiListener::DeleteConfigObject(const ConfigObject::Ptr& object, const Mess
 	if (object->GetPackage() != "_api")
 		return;
 
+	Dictionary::Ptr deletionInfo = new Dictionary{
+		{"version", object->GetVersion()},
+		{"deleted", Utility::GetTime()},
+	};
+	GetDeletedRuntimeObjects()->Set(object->GetName(), deletionInfo);
+
 	/* only send objects to zones which have access to the object */
 	if (client) {
 		Zone::Ptr target_zone = client->GetEndpoint()->GetZone();
@@ -508,3 +524,17 @@ void ApiListener::SendRuntimeConfigObjects(const JsonRpcConnection::Ptr& aclient
 	Log(LogInformation, "ApiListener")
 		<< "Finished syncing runtime objects to endpoint '" << endpoint->GetName() << "'.";
 }
+
+void ApiListener::PruneDeletedRuntimeObjects()
+{
+	auto deletedRuntimeObjects = GetDeletedRuntimeObjects();
+	double cutoff = Utility::GetTime() - GetLocalEndpoint()->GetLogDuration();
+	ObjectLock lock(deletedRuntimeObjects);
+
+	for (auto it = deletedRuntimeObjects->Begin(); it != deletedRuntimeObjects->End(); ++it) {
+		Dictionary::Ptr deletedInfo = it->second;
+		if (deletedInfo->Get("deleted") < cutoff) {
+			deletedRuntimeObjects->Remove(it);
+		};
+	}
+}

lib/remote/apilistener.hpp

@@ -142,6 +142,8 @@ class ApiListener final : public ObjectImpl<ApiListener>
 
 	static void UpdateObjectAuthority();
 
+	void PruneDeletedRuntimeObjects();
+
 	static bool IsHACluster();
 	static String GetFromZoneName(const Zone::Ptr& fromZone);
 

lib/remote/apilistener.ti

@@ -63,6 +63,10 @@ class ApiListener : ConfigObject
 	[no_user_modify] String identity;
 
 	[state, no_user_modify] Dictionary::Ptr last_failed_zones_stage_validation;
+
+	[state, no_user_modify] Dictionary::Ptr deleted_runtime_objects {
+		default {{{ return new Dictionary(); }}}
+	};
 };
 
 }