Compare commits

..

2 Commits

Author SHA1 Message Date
Vitaliy Filippov 8426616d89 Warn about unfinished deletions in rm-data
Test / test_create_nomaxid (push) Successful in 7s Details
Test / test_etcd_fail (push) Successful in 1m46s Details
Test / test_interrupted_rebalance (push) Successful in 2m34s Details
Test / test_interrupted_rebalance_imm (push) Successful in 2m50s Details
Test / test_interrupted_rebalance_ec (push) Successful in 1m35s Details
Test / test_interrupted_rebalance_ec_imm (push) Failing after 10m6s Details
Test / test_failure_domain (push) Successful in 12s Details
Test / test_snapshot (push) Successful in 21s Details
Test / test_snapshot_ec (push) Successful in 27s Details
Test / test_minsize_1 (push) Successful in 12s Details
Test / test_move_reappear (push) Failing after 48s Details
Test / test_rm (push) Successful in 13s Details
Test / test_snapshot_chain (push) Successful in 1m35s Details
Test / test_snapshot_chain_ec (push) Successful in 2m11s Details
Test / test_splitbrain (push) Successful in 15s Details
Test / test_rebalance_verify (push) Successful in 3m4s Details
Test / test_rebalance_verify_imm (push) Successful in 3m0s Details
Test / test_rebalance_verify_ec (push) Successful in 3m25s Details
Test / test_rebalance_verify_ec_imm (push) Successful in 4m58s Details
Test / test_write (push) Successful in 35s Details
Test / test_write_xor (push) Successful in 34s Details
Test / test_write_no_same (push) Successful in 12s Details
Test / test_heal_pg_size_2 (push) Successful in 4m3s Details
Test / test_heal_ec (push) Successful in 3m53s Details
Test / test_scrub (push) Successful in 26s Details
Test / test_scrub_zero_osd_2 (push) Successful in 35s Details
Test / test_scrub_xor (push) Successful in 35s Details
Test / test_scrub_pg_size_3 (push) Successful in 45s Details
Test / test_scrub_pg_size_6_pg_minsize_4_osd_count_6_ec (push) Successful in 32s Details
Test / test_scrub_ec (push) Successful in 25s Details
2023-06-30 01:18:25 +03:00
Vitaliy Filippov 1a841344ec Print progress of all operations during snapshot merge 2023-06-30 01:13:47 +03:00
2 changed files with 20 additions and 4 deletions

View File

@ -137,6 +137,8 @@ resume_2:
state = 100; state = 100;
return; return;
} }
else if (parent->progress)
printf("%s\n", result.text.c_str());
parent->change_parent(merge_children[current_child], new_parent, &result); parent->change_parent(merge_children[current_child], new_parent, &result);
state = 3; state = 3;
resume_3: resume_3:
@ -168,6 +170,8 @@ resume_4:
state = 100; state = 100;
return; return;
} }
else if (parent->progress)
printf("%s\n", result.text.c_str());
// Delete "inverse" child data // Delete "inverse" child data
start_delete_source(inverse_child); start_delete_source(inverse_child);
if (state == 100) if (state == 100)
@ -184,6 +188,8 @@ resume_5:
state = 100; state = 100;
return; return;
} }
else if (parent->progress)
printf("%s\n", result.text.c_str());
// Delete "inverse" child metadata, rename parent over it, // Delete "inverse" child metadata, rename parent over it,
// and also change parent links of the previous "inverse" child // and also change parent links of the previous "inverse" child
rename_inverse_parent(); rename_inverse_parent();
@ -212,6 +218,8 @@ resume_7:
state = 100; state = 100;
return; return;
} }
else if (parent->progress)
printf("%s\n", result.text.c_str());
delete_inode_config(chain_list[current_child]); delete_inode_config(chain_list[current_child]);
if (state == 100) if (state == 100)
return; return;

View File

@ -183,6 +183,18 @@ struct rm_inode_t
} }
if (lists_done && !lists.size()) if (lists_done && !lists.size())
{ {
if (parent->progress && total_count > 0)
{
fprintf(stderr, "\n");
}
if (parent->progress && (total_done < total_count || inactive_osds.size() > 0))
{
fprintf(
stderr, "Warning: Pool:%u,ID:%lu inode data may not have been fully removed.\n"
" Use `vitastor-cli rm-data --pool %u --inode %lu` if you encounter it in listings.\n",
pool_id, INODE_NO_POOL(inode), pool_id, INODE_NO_POOL(inode)
);
}
result = (cli_result_t){ result = (cli_result_t){
.err = error_count > 0 ? EIO : 0, .err = error_count > 0 ? EIO : 0,
.text = error_count > 0 ? "Some blocks were not removed" : ( .text = error_count > 0 ? "Some blocks were not removed" : (
@ -195,10 +207,6 @@ struct rm_inode_t
}, },
}; };
state = 100; state = 100;
if (parent->progress && total_count > 0)
{
fprintf(stderr, "\n");
}
} }
} }