MXS-619: Allow backend authentication to complete

By deferring the closing of a DCB until the protocol tells that it's in a
stable state, we avoid closing the connection mid-authentication. This
makes sure that all connections have reached a stable state before they
are closed which in turn prevents the connections from counting towards
aborted connects (or failed authentications like it did with the old fix).
This commit is contained in:
Markus Mäkelä
2020-07-01 10:21:07 +03:00
parent ae2cad9254
commit a655c5d08c
4 changed files with 64 additions and 4 deletions

View File

@ -161,6 +161,15 @@ void modules_thread_finish()
}
}
}
bool can_close_dcb(DCB* dcb)
{
auto idle = MXS_CLOCK_TO_SEC(mxs_clock() - dcb->last_read);
return idle > 5 // Timed out
|| !dcb->func.can_close // Not implemented
|| dcb->func.can_close(dcb); // Protocol says it's OK to close
}
}
namespace maxscale
@ -550,6 +559,8 @@ void RoutingWorker::register_zombie(DCB* pDcb)
void RoutingWorker::delete_zombies()
{
Zombies not_ready;
// An algorithm cannot be used, as the final closing of a DCB may cause
// other DCBs to be registered in the zombie queue.
@ -557,8 +568,18 @@ void RoutingWorker::delete_zombies()
{
DCB* pDcb = m_zombies.back();
m_zombies.pop_back();
dcb_final_close(pDcb);
if (can_close_dcb(pDcb))
{
dcb_final_close(pDcb);
}
else
{
not_ready.push_back(pDcb);
}
}
m_zombies.insert(m_zombies.end(), not_ready.begin(), not_ready.end());
}
bool RoutingWorker::pre_run()