thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent double handle_primary_subop in rare cases

Browse Source
This commit is contained in:
Vitaliy Filippov
2025-04-26 01:16:53 +03:00
parent 10fd51862a
commit 2b2a10581d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/osd/osd_primary_subops.cpp
+3 -2
View File
@@ -452,15 +452,16 @@ void osd_t::handle_primary_subop(osd_op_t *subop, osd_op_t *cur_op)
{ {
op_data->errcode = retval; op_data->errcode = retval;
} }
op_data->errors++;
if (subop->peer_fd >= 0 && retval != -EDOM && retval != -ERANGE && if (subop->peer_fd >= 0 && retval != -EDOM && retval != -ERANGE &&
(retval != -ENOSPC || opcode != OSD_OP_SEC_WRITE && opcode != OSD_OP_SEC_WRITE_STABLE) && (retval != -ENOSPC || opcode != OSD_OP_SEC_WRITE && opcode != OSD_OP_SEC_WRITE_STABLE) &&
(retval != -EIO || opcode != OSD_OP_SEC_READ)) (retval != -EIO || opcode != OSD_OP_SEC_READ))
{ {
// Drop connection on unexpected errors // Drop connection on unexpected errors
op_data->drops++;
msgr.stop_client(subop->peer_fd); msgr.stop_client(subop->peer_fd);
op_data->drops++;
} }
// Increase op_data->errors after stop_client to prevent >= n_subops running twice
op_data->errors++;
} }
else else
{ {