postgres/typesense
1
0
Fork 0
mirror of https://github.com/typesense/typesense.git synced 2025-05-19 21:22:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Avoid reading request object after enqueuing.

Browse Source
This commit is contained in:
Kishore Nallan 2021-10-18 12:08:37 +05:30
parent 0c459609c0
commit 0f36b15d5f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/batched_indexer.cpp
View File

@ -62,21 +62,26 @@ void BatchedIndexer::enqueue(const std::shared_ptr<http_req>& req, const std::sh
}
}
bool is_old_serialized_request = (req->start_ts == 0);
bool read_more_input = (req->_req != nullptr && req->_req->proceed_req);
if(req->last_chunk_aggregate) {
//LOG(INFO) << "Last chunk for req_id: " << req->start_ts << ", queue_id: " << queue_id;
queued_writes += (chunk_sequence + 1);
std::unique_lock lk(mutex);
request_to_chunk.erase(req->start_ts);
lk.unlock();
{
std::unique_lock lk(qmutuxes[queue_id]);
queues[queue_id].emplace_back(req->start_ts);
}
std::unique_lock lk(mutex);
request_to_chunk.erase(req->start_ts);
lk.unlock();
// IMPORTANT: must not read `req` variables (except _req) henceforth to prevent data races with indexing thread
if(req->start_ts == 0) {
if(is_old_serialized_request == 0) {
// Indicates a serialized request from a version that did not support batching (v0.21 and below).
// We can only do serial writes as we cannot reliably distinguish one streaming request from another.
// So, wait for `req_res_map` to be empty before proceeding
@ -92,7 +97,7 @@ void BatchedIndexer::enqueue(const std::shared_ptr<http_req>& req, const std::sh
}
}
if(req->_req != nullptr && req->_req->proceed_req) {
if(read_more_input) {
// Tell the http library to read more input data
deferred_req_res_t* req_res = new deferred_req_res_t(req, res, server, true);
server->get_message_dispatcher()->send_message(HttpServer::REQUEST_PROCEED_MESSAGE, req_res);