Second sync after delete
Test / buildenv (push) Successful in 18s Details
Test / build (push) Successful in 2m59s Details
Test / test_cas (push) Successful in 13s Details
Test / make_test (push) Successful in 37s Details
Test / test_change_pg_size (push) Successful in 11s Details
Test / test_change_pg_count (push) Successful in 43s Details
Test / test_change_pg_count_ec (push) Successful in 35s Details
Test / test_create_nomaxid (push) Successful in 10s Details
Test / test_etcd_fail (push) Successful in 1m4s Details
Test / test_add_osd (push) Successful in 2m47s Details
Test / test_interrupted_rebalance_imm (push) Successful in 2m1s Details
Test / test_failure_domain (push) Successful in 42s Details
Test / test_interrupted_rebalance (push) Successful in 2m56s Details
Test / test_interrupted_rebalance_ec (push) Successful in 1m55s Details
Test / test_snapshot (push) Successful in 23s Details
Test / test_minsize_1 (push) Successful in 15s Details
Test / test_interrupted_rebalance_ec_imm (push) Successful in 1m27s Details
Test / test_snapshot_ec (push) Successful in 29s Details
Test / test_rm (push) Successful in 16s Details
Test / test_move_reappear (push) Successful in 23s Details
Test / test_snapshot_down (push) Successful in 34s Details
Test / test_snapshot_down_ec (push) Successful in 33s Details
Test / test_splitbrain (push) Successful in 26s Details
Test / test_snapshot_chain (push) Successful in 2m18s Details
Test / test_snapshot_chain_ec (push) Successful in 3m12s Details
Test / test_rebalance_verify_imm (push) Successful in 2m51s Details
Test / test_rebalance_verify (push) Successful in 3m27s Details
Test / test_switch_primary (push) Successful in 40s Details
Test / test_write (push) Successful in 45s Details
Test / test_write_no_same (push) Successful in 21s Details
Test / test_write_xor (push) Successful in 53s Details
Test / test_rebalance_verify_ec (push) Successful in 4m56s Details
Test / test_rebalance_verify_ec_imm (push) Successful in 4m32s Details
Test / test_heal_csum_32k (push) Successful in 6m56s Details
Test / test_heal_csum_4k_dmj (push) Successful in 7m26s Details
Test / test_scrub (push) Successful in 1m16s Details
Test / test_scrub_xor (push) Successful in 1m6s Details
Test / test_scrub_zero_osd_2 (push) Successful in 1m14s Details
Test / test_scrub_pg_size_6_pg_minsize_4_osd_count_6_ec (push) Successful in 1m33s Details
Test / test_heal_csum_4k_dj (push) Successful in 6m42s Details
Test / test_scrub_pg_size_3 (push) Successful in 2m8s Details
Test / test_scrub_ec (push) Successful in 41s Details
Test / test_heal_csum_4k (push) Successful in 5m44s Details
Test / test_heal_csum_32k_dmj (push) Has been cancelled Details
Test / test_heal_csum_32k_dj (push) Has been cancelled Details
Test / test_heal_ec (push) Has been cancelled Details
Test / test_heal_pg_size_2 (push) Has been cancelled Details

Vitaliy Filippov 2024-02-21 13:59:59 +03:00
parent 5471d51605
commit 9aeec0269a
1 changed files with 18 additions and 0 deletions

View File

@ -19,6 +19,8 @@ void osd_t::continue_primary_sync(osd_op_t *cur_op)
else if (op_data->st == 6) goto resume_6;
else if (op_data->st == 7) goto resume_7;
else if (op_data->st == 8) goto resume_8;
else if (op_data->st == 9) goto resume_9;
else if (op_data->st == 10) goto resume_10;
assert(op_data->st == 0);
if (syncs_in_progress.size() > 0)
{
@ -213,6 +215,22 @@ resume_8:
{
goto resume_6;
}
if (immediate_commit != IMMEDIATE_ALL)
{
// SYNC
if (!submit_primary_sync_subops(cur_op))
{
goto resume_10;
}
resume_9:
op_data->st = 9;
return;
resume_10:
if (op_data->errors > 0)
{
goto resume_6;
}
}
}
for (int i = 0; i < op_data->dirty_pg_count; i++)
{