Prune runtime-deleted object dictionary every 15 Minutes

Author: jschmidt-icinga

lib/remote/apilistener-configsync.cpp

@@ -532,3 +532,23 @@ void ApiListener::SendRuntimeConfigObjects(const JsonRpcConnection::Ptr& aclient
 	Log(LogInformation, "ApiListener")
 		<< "Finished syncing runtime objects to endpoint '" << endpoint->GetName() << "'.";
 }
+
+void ApiListener::PruneDeletedRuntimeObjects()
+{
+	auto deletedRuntimeObjects = GetDeletedRuntimeObjects();
+
+	auto endpoints = ConfigType::GetObjectsByType<Endpoint>();
+	auto it = std::max_element(endpoints.begin(), endpoints.end(), [](const auto& a, const auto& b) {
+		return a->GetLogDuration() < b->GetLogDuration();
+	});
+	ASSERT(it != endpoints.end());
+	auto maxLogDuration = (*it)->GetLogDuration();
+
+	ObjectLock lock(deletedRuntimeObjects);
+
+	for (auto it = deletedRuntimeObjects->Begin(); it != deletedRuntimeObjects->End(); ++it) {
+		if (it->second <= maxLogDuration) {
+			deletedRuntimeObjects->Remove(it);
+		};
+	}
+}

lib/remote/apilistener.cpp

@@ -285,6 +285,12 @@ void ApiListener::Start(bool runtimeCreated)
 	m_Timer->Start();
 	m_Timer->Reschedule(0);
 
+	m_DeletedRuntimeObjectsTimer = Timer::Create();
+	m_DeletedRuntimeObjectsTimer->OnTimerExpired.connect([this](const Timer* const&) { PruneDeletedRuntimeObjects(); });
+	m_DeletedRuntimeObjectsTimer->SetInterval(15 * 60);
+	m_DeletedRuntimeObjectsTimer->Start();
+	m_DeletedRuntimeObjectsTimer->Reschedule(0);
+
 	m_ReconnectTimer = Timer::Create();
 	m_ReconnectTimer->OnTimerExpired.connect([this](const Timer * const&) { ApiReconnectTimerHandler(); });
 	m_ReconnectTimer->SetInterval(10);

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);
 
@@ -183,6 +185,7 @@ class ApiListener final : public ObjectImpl<ApiListener>
 	std::set<HttpServerConnection::Ptr> m_HttpClients;
 
 	Timer::Ptr m_Timer;
+	Timer::Ptr m_DeletedRuntimeObjectsTimer;
 	Timer::Ptr m_ReconnectTimer;
 	Timer::Ptr m_AuthorityTimer;
 	Timer::Ptr m_CleanupCertificateRequestsTimer;