Track deleted runtime objects to avaóid erroneous recreation

Author: jschmidt-icinga

lib/remote/apilistener-configsync.cpp

@@ -98,6 +98,15 @@ Value ApiListener::ConfigUpdateObjectAPIHandler(const MessageOrigin::Ptr& origin
 	/* update the object */
 	double objVersion = params->Get("version");
 
+	auto deletedRuntimeObjects = listener->GetDeletedRuntimeObjects();
+	if (deletedRuntimeObjects->Get(objName) >= objVersion) {
+		Log(LogWarning, "ApiListener")
+			<< "Ignoring config update for deleted object '" << objName << "' of type '" << objType
+			<< "' from '" << identity << "' (endpoint: '" << endpoint->GetName() << "', zone: '" << endpointZone->GetName() << "')";
+		return Empty;
+	}
+	deletedRuntimeObjects->Remove(objName);
+	
 	Type::Ptr ptype = Type::GetByName(objType);
 	auto *ctype = dynamic_cast<ConfigType *>(ptype.get());
 
@@ -437,6 +446,8 @@ void ApiListener::DeleteConfigObject(const ConfigObject::Ptr& object, const Mess
 	if (object->GetPackage() != "_api")
 		return;
 
+	GetDeletedRuntimeObjects()->Set(object->GetName(), object->GetVersion());
+
 	/* only send objects to zones which have access to the object */
 	if (client) {
 		Zone::Ptr target_zone = client->GetEndpoint()->GetZone();

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(); }}}
+	};
 };
 
 }