tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IcingaDB: handle Redis restarts

This commit is contained in:
Alexander A. Klimov 2019-11-21 12:55:01 +01:00
parent 7849da0b78
commit e7ce71095a
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/icingadb/redisconnection.hpp
View File

@ -207,6 +207,8 @@ private:
template<class StreamPtr> template<class StreamPtr>
RedisConnection::Reply RedisConnection::ReadOne(StreamPtr& stream, boost::asio::yield_context& yc) RedisConnection::Reply RedisConnection::ReadOne(StreamPtr& stream, boost::asio::yield_context& yc)
{ {
namespace asio = boost::asio;
if (!stream) { if (!stream) {
throw RedisDisconnected(); throw RedisDisconnected();
} }
@ -221,6 +223,12 @@ RedisConnection::Reply RedisConnection::ReadOne(StreamPtr& stream, boost::asio::
if (m_Connecting.exchange(false)) { if (m_Connecting.exchange(false)) {
m_Connected.store(false); m_Connected.store(false);
stream = nullptr; stream = nullptr;
if (!m_Connecting.exchange(true)) {
Ptr keepAlive (this);
asio::spawn(m_Strand, [this, keepAlive](asio::yield_context yc) { Connect(yc); });
}
} }
throw; throw;
@ -230,6 +238,8 @@ RedisConnection::Reply RedisConnection::ReadOne(StreamPtr& stream, boost::asio::
template<class StreamPtr> template<class StreamPtr>
void RedisConnection::WriteOne(StreamPtr& stream, RedisConnection::Query& query, boost::asio::yield_context& yc) void RedisConnection::WriteOne(StreamPtr& stream, RedisConnection::Query& query, boost::asio::yield_context& yc)
{ {
namespace asio = boost::asio;
if (!stream) { if (!stream) {
throw RedisDisconnected(); throw RedisDisconnected();
} }
@ -245,6 +255,12 @@ void RedisConnection::WriteOne(StreamPtr& stream, RedisConnection::Query& query,
if (m_Connecting.exchange(false)) { if (m_Connecting.exchange(false)) {
m_Connected.store(false); m_Connected.store(false);
stream = nullptr; stream = nullptr;
if (!m_Connecting.exchange(true)) {
Ptr keepAlive (this);
asio::spawn(m_Strand, [this, keepAlive](asio::yield_context yc) { Connect(yc); });
}
} }
throw; throw;