mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-24449 cleanup: Remove a timeout

Browse source 
recv_sys_t::apply(): At the end of the last batch, wait for
pending reads to complete (read_slots->wait()), instead of
waiting for some time, and assert that buf_pool.n_pend_reads==0
after that wait.

io_callback(): Do not invoke read_slots->release()
before the callback function has returned, to ensure
the correct operation of recv_sys_t::apply().
This commit is contained in:
Marko Mäkelä 2020-12-22 07:42:03 +02:00
parent 2f6970ef1c
commit 3b7dbdf080
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/include/os0file.h
View file

@ -1157,6 +1157,8 @@ be other, synchronous, pending writes. */
void
os_aio_wait_until_no_pending_writes();
/** Wait until all pending asynchronous reads have completed. */
void os_aio_wait_until_no_pending_reads();
/** Prints info of the aio arrays.
@param[in/out] file file where to print */

7
storage/innobase/log/log0recv.cc
View file

@ -2754,8 +2754,11 @@ next_page:
mysql_cond_wait(&cond, &mutex);
else
{
set_timespec_nsec(abstime, 100000ULL); /* 0.1ms */
mysql_cond_timedwait(&cond, &mutex, &abstime);
mysql_mutex_unlock(&mutex);
os_aio_wait_until_no_pending_reads();
ut_ad(!buf_pool.n_pend_reads);
mysql_mutex_lock(&mutex);
ut_ad(pages.empty());
}
}
else

18
storage/innobase/os/os0file.cc
View file

@ -3859,24 +3859,26 @@ os_file_get_status(
extern void fil_aio_callback(const IORequest &request);
static void io_callback(tpool::aiocb* cb)
static void io_callback(tpool::aiocb *cb)
{
ut_a(cb->m_err == DB_SUCCESS);
const IORequest request(*static_cast<const IORequest*>
(static_cast<const void*>(cb->m_userdata)));
const IORequest &request= *static_cast<const IORequest*>
(static_cast<const void*>(cb->m_userdata));
/* Return cb back to cache*/
if (cb->m_opcode == tpool::aio_opcode::AIO_PREAD)
{
ut_ad(read_slots->contains(cb));
fil_aio_callback(request);
read_slots->release(cb);
}
else
{
ut_ad(write_slots->contains(cb));
const IORequest req{request};
write_slots->release(cb);
fil_aio_callback(req);
}
fil_aio_callback(request);
}
#ifdef LINUX_NATIVE_AIO
@ -4072,6 +4074,12 @@ void os_aio_wait_until_no_pending_writes()
buf_dblwr.wait_flush_buffered_writes();
}
/** Wait until all pending asynchronous reads have completed. */
void os_aio_wait_until_no_pending_reads()
{
read_slots->wait();
}
/** Request a read or write.
@param type I/O request
@param buf buffer