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

Always check pool resharding state also for stabilize/rollback

Browse Source
This commit is contained in:
Vitaliy Filippov
2026-05-10 13:22:02 +03:00
parent 553191c3ff
commit e4d80c415e
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/osd/osd_secondary.cpp
+7 -10
View File
@@ -192,16 +192,13 @@ void osd_t::exec_secondary_real(osd_op_t *cur_op)
#ifdef OSD_STUB #ifdef OSD_STUB
cur_op->bs_op->retval = 0; cur_op->bs_op->retval = 0;
#endif #endif
if (enable_pg_locks) for (int i = 0; i < cur_op->bs_op->len; i++)
{ {
for (int i = 0; i < cur_op->bs_op->len; i++) if (!sec_check_pg_lock(cl->in_osd_num, ((obj_ver_id*)cur_op->buf)[i].oid, cur_op->req.sec_stab.flags))
{ {
if (!sec_check_pg_lock(cl->in_osd_num, ((obj_ver_id*)cur_op->buf)[i].oid, cur_op->req.sec_stab.flags)) cur_op->bs_op->retval = -EPIPE;
{ secondary_op_callback(cur_op);
cur_op->bs_op->retval = -EPIPE; return;
secondary_op_callback(cur_op);
return;
}
} }
} }
} }
@@ -215,8 +212,8 @@ void osd_t::exec_secondary_real(osd_op_t *cur_op)
secondary_op_callback(cur_op); secondary_op_callback(cur_op);
return; return;
} }
auto pool_id = INODE_POOL(cur_op->bs_op->min_oid.inode); auto pool_id = INODE_POOL(cur_op->req.sec_list.min_inode);
if (pool_id && !sec_check_pg_lock(0, (object_id){ .inode = cur_op->bs_op->min_oid.inode }, OSD_OP_IGNORE_PG_LOCK)) if (!pool_id || !sec_check_pg_lock(0, (object_id){ .inode = cur_op->req.sec_list.min_inode }, OSD_OP_IGNORE_PG_LOCK))
{ {
// Check resharding state of the pool // Check resharding state of the pool
cur_op->bs_op->retval = -EPIPE; cur_op->bs_op->retval = -EPIPE;