hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove avrorouter deadlock

Browse Source 
The avrorouter would attempt to enable the conversion task from within the
conversion task itself. This caused a deadlock which led to test failures.
This commit is contained in:
Markus Mäkelä
2018-04-27 10:02:14 +03:00
parent 59165b8dd5
commit e01cfe0fba
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/routing/avrorouter/avro.c
View File

@ -1220,12 +1220,10 @@ bool converter_func(void* data)
if (binlog_end == AVRO_LAST_FILE) if (binlog_end == AVRO_LAST_FILE)
{ {
router->task_delay = MXS_MIN(router->task_delay + 1, AVRO_TASK_DELAY_MAX); router->task_delay = MXS_MIN(router->task_delay + 1, AVRO_TASK_DELAY_MAX);
if (conversion_task_ctl(router, true))
{ MXS_INFO("Stopped processing file %s at position %lu. Waiting until"
MXS_INFO("Stopped processing file %s at position %lu. Waiting until" " more data is written before continuing. Next check in %d seconds.",
" more data is written before continuing. Next check in %d seconds.", router->binlog_name, router->current_pos, router->task_delay);
router->binlog_name, router->current_pos, router->task_delay);
}
} }
return true; return true;