Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RedisConnection#Connect(): get rid of spin lock #10265

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RedisConnection#Connect(): get rid of spin lock #10265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions lib/icingadb/redisconnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RedisConnection::RedisConnection(boost::asio::io_context& io, String host, int p
m_DbIndex(db), m_CertPath(std::move(certPath)), m_KeyPath(std::move(keyPath)), m_Insecure(insecure),
m_CaPath(std::move(caPath)), m_CrlPath(std::move(crlPath)), m_TlsProtocolmin(std::move(tlsProtocolmin)),
m_CipherList(std::move(cipherList)), m_ConnectTimeout(connectTimeout), m_DebugInfo(std::move(di)), m_Connecting(false), m_Connected(false),
m_Started(false), m_Strand(io), m_QueuedWrites(io), m_QueuedReads(io), m_LogStatsTimer(io), m_Parent(parent)
m_Started(false), m_Strand(io), m_QueuedWrites(io), m_QueuedReads(io), m_NoQueuedReads(io, true), m_LogStatsTimer(io), m_Parent(parent)
{
if (useTls && m_Path.IsEmpty()) {
UpdateTLSContext();
Expand Down Expand Up @@ -302,12 +302,6 @@ void RedisConnection::Connect(asio::yield_context& yc)

boost::asio::deadline_timer timer (m_Strand.context());

auto waitForReadLoop ([this, &yc]() {
while (!m_Queues.FutureResponseActions.empty()) {
IoEngine::YieldCurrentCoroutine(yc);
}
});

for (;;) {
try {
if (m_Path.IsEmpty()) {
Expand Down Expand Up @@ -340,7 +334,7 @@ void RedisConnection::Connect(asio::yield_context& yc)
}

Handshake(conn, yc);
waitForReadLoop();
m_NoQueuedReads.Wait(yc);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I often struggle to differentiate between the AsioConditionVariable::Clear() and AsioConditionVariable::Set() methods since they seem to perform very similar functions, and neither of them includes a clear comment explaining their purpose. And yet, I had to trace on my own to understand why the init parameter is set for this in the constructor but not for the others. Could you please provide some comments explaining the scenarios in which this gets unblocked? Additionally, I would suggest naming that new property something like m_ReadLoopDone to better reflect its original intentions.

m_TlsConn = std::move(conn);
} else {
Log(m_Parent ? LogNotice : LogInformation, "IcingaDB")
Expand All @@ -352,7 +346,7 @@ void RedisConnection::Connect(asio::yield_context& yc)

icinga::Connect(conn->next_layer(), m_Host, Convert::ToString(m_Port), yc);
Handshake(conn, yc);
waitForReadLoop();
m_NoQueuedReads.Wait(yc);
m_TcpConn = std::move(conn);
}
} else {
Expand All @@ -365,7 +359,7 @@ void RedisConnection::Connect(asio::yield_context& yc)

conn->next_layer().async_connect(Unix::endpoint(m_Path.CStr()), yc);
Handshake(conn, yc);
waitForReadLoop();
m_NoQueuedReads.Wait(yc);
m_UnixConn = std::move(conn);
}

Expand Down Expand Up @@ -477,6 +471,7 @@ void RedisConnection::ReadLoop(asio::yield_context& yc)
}

m_QueuedReads.Clear();
m_NoQueuedReads.Set();
}
}

Expand Down Expand Up @@ -577,6 +572,7 @@ void RedisConnection::WriteItem(boost::asio::yield_context& yc, RedisConnection:
}

m_QueuedReads.Set();
m_NoQueuedReads.Clear();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not perform this within the ReadLoop method once m_QueuedReads.Wait() returns?

}

if (next.FireAndForgetQueries) {
Expand Down Expand Up @@ -613,6 +609,7 @@ void RedisConnection::WriteItem(boost::asio::yield_context& yc, RedisConnection:
}

m_QueuedReads.Set();
m_NoQueuedReads.Clear();
}

if (next.GetResultOfQuery) {
Expand All @@ -638,6 +635,7 @@ void RedisConnection::WriteItem(boost::asio::yield_context& yc, RedisConnection:
}

m_QueuedReads.Set();
m_NoQueuedReads.Clear();
}

if (next.GetResultsOfQueries) {
Expand All @@ -660,6 +658,7 @@ void RedisConnection::WriteItem(boost::asio::yield_context& yc, RedisConnection:
m_Queues.FutureResponseActions.emplace(FutureResponseAction{item.first.size(), ResponseAction::DeliverBulk});

m_QueuedReads.Set();
m_NoQueuedReads.Clear();
}

if (next.Callback) {
Expand Down
2 changes: 1 addition & 1 deletion lib/icingadb/redisconnection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ namespace icinga
std::set<QueryPriority> m_SuppressedQueryKinds;

// Indicate that there's something to send/receive
AsioConditionVariable m_QueuedWrites, m_QueuedReads;
AsioConditionVariable m_QueuedWrites, m_QueuedReads, m_NoQueuedReads;

std::function<void(boost::asio::yield_context& yc)> m_ConnectedCallback;

Expand Down
Loading