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

Track in_flight for sync & delete in vitastor-cli merge

Browse Source
This commit is contained in:
Vitaliy Filippov
2026-06-20 11:43:33 +03:00
parent d93b488e32
commit d2cf271f64
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd/cli_merge.cpp
+5 -1
View File
@@ -614,8 +614,10 @@ struct snap_merger_t
subop->offset = offset; subop->offset = offset;
subop->len = 0; subop->len = 0;
subop->flags = OSD_OP_IGNORE_READONLY | OSD_OP_WAIT_UP_TIMEOUT; subop->flags = OSD_OP_IGNORE_READONLY | OSD_OP_WAIT_UP_TIMEOUT;
subop->callback = [](cluster_op_t *subop) in_flight++;
subop->callback = [this](cluster_op_t *subop)
{ {
in_flight--;
if (subop->retval != 0) if (subop->retval != 0)
{ {
fprintf(stderr, "error deleting from layer 0x%jx at offset %jx: %s", subop->inode, subop->offset, strerror(-subop->retval)); fprintf(stderr, "error deleting from layer 0x%jx at offset %jx: %s", subop->inode, subop->offset, strerror(-subop->retval));
@@ -642,8 +644,10 @@ struct snap_merger_t
uint64_t to = last_written_offset; uint64_t to = last_written_offset;
cluster_op_t *subop = new cluster_op_t; cluster_op_t *subop = new cluster_op_t;
subop->opcode = OSD_OP_SYNC; subop->opcode = OSD_OP_SYNC;
in_flight++;
subop->callback = [this, to](cluster_op_t *subop) subop->callback = [this, to](cluster_op_t *subop)
{ {
in_flight--;
delete subop; delete subop;
// We can now delete source data between <from> and <to> // We can now delete source data between <from> and <to>
// But to do this we have to keep all object lists in memory :-( // But to do this we have to keep all object lists in memory :-(