Revert "IcingaDB: suppress state sync until config sync finished"

This reverts commit f6f7d9b and all
other its new users.

Author: yhabteab

lib/icingadb/icingadb-objects.cpp

@@ -214,14 +214,6 @@ void IcingaDB::UpdateAllConfigObjects()
 
 	std::vector<Type::Ptr> types = GetTypes();
 
-	m_Rcon->SuppressQueryKind(Prio::CheckResult);
-	m_Rcon->SuppressQueryKind(Prio::RuntimeStateSync);
-
-	Defer unSuppress ([this]() {
-		m_Rcon->UnsuppressQueryKind(Prio::RuntimeStateSync);
-		m_Rcon->UnsuppressQueryKind(Prio::CheckResult);
-	});
-
 	// Add a new type=* state=wip entry to the stream and remove all previous entries (MAXLEN 1).
 	m_Rcon->FireAndForgetQuery({"XADD", "icinga:dump", "MAXLEN", "1", "*", "key", "*", "state", "wip"}, Prio::Config);
 

lib/icingadb/icingadb.cpp

@@ -127,9 +127,6 @@ void IcingaDB::Start(bool runtimeCreated)
 
 	m_WorkQueue.SetName("IcingaDB");
 
-	m_Rcon->SuppressQueryKind(Prio::CheckResult);
-	m_Rcon->SuppressQueryKind(Prio::RuntimeStateSync);
-
 	Ptr keepAlive (this);
 
 	m_HistoryThread = std::async(std::launch::async, [this, keepAlive]() { ForwardHistoryEntries(); });

lib/icingadb/redisconnection.cpp

@@ -299,7 +299,7 @@ double RedisConnection::GetOldestPendingQueryTs()
 		double oldest = 0;
 
 		for (auto& queue : m_Queues.Writes) {
-			if (m_SuppressedQueryKinds.find(queue.first) == m_SuppressedQueryKinds.end() && !queue.second.empty()) {
+			if (!queue.second.empty()) {
 				auto ctime (queue.second.front().CTime);
 
 				if (ctime < oldest || oldest == 0) {
@@ -315,29 +315,6 @@ double RedisConnection::GetOldestPendingQueryTs()
 	return future.get();
 }
 
-/**
- * Mark kind as kind of queries not to actually send yet
- *
- * @param kind Query kind
- */
-void RedisConnection::SuppressQueryKind(RedisConnection::QueryPriority kind)
-{
-	asio::post(m_Strand, [this, kind]() { m_SuppressedQueryKinds.emplace(kind); });
-}
-
-/**
- * Unmark kind as kind of queries not to actually send yet
- *
- * @param kind Query kind
- */
-void RedisConnection::UnsuppressQueryKind(RedisConnection::QueryPriority kind)
-{
-	asio::post(m_Strand, [this, kind]() {
-		m_SuppressedQueryKinds.erase(kind);
-		m_QueuedWrites.Set();
-	});
-}
-
 /**
  * Try to connect to Redis
  */
@@ -518,7 +495,7 @@ void RedisConnection::WriteLoop(asio::yield_context& yc)
 
 	WriteFirstOfHighestPrio:
 		for (auto& queue : m_Queues.Writes) {
-			if (m_SuppressedQueryKinds.find(queue.first) != m_SuppressedQueryKinds.end() || queue.second.empty()) {
+			if (queue.second.empty()) {
 				continue;
 			}
 

lib/icingadb/redisconnection.hpp

@@ -37,7 +37,6 @@
 #include <map>
 #include <memory>
 #include <queue>
-#include <set>
 #include <stdexcept>
 #include <utility>
 #include <vector>
@@ -103,9 +102,6 @@ namespace icinga
 		void Sync();
 		double GetOldestPendingQueryTs();
 
-		void SuppressQueryKind(QueryPriority kind);
-		void UnsuppressQueryKind(QueryPriority kind);
-
 		void SetConnectedCallback(std::function<void(boost::asio::yield_context& yc)> callback);
 
 		int GetQueryCount(RingBuffer::SizeType span);
@@ -237,9 +233,6 @@ namespace icinga
 			std::queue<FutureResponseAction> FutureResponseActions;
 		} m_Queues;
 
-		// Kinds of queries not to actually send yet
-		std::set<QueryPriority> m_SuppressedQueryKinds;
-
 		// Indicate that there's something to send/receive
 		AsioEvent m_QueuedWrites;
 		AsioDualEvent m_QueuedReads;