Fix failed assert(!scrub_list_op) on OSD restart with pending scrubs
Test / test_heal_ec (push) Successful in 3m21s
Details
Test / buildenv (push) Successful in 9s
Details
Test / build (push) Successful in 2m36s
Details
Test / make_test (push) Successful in 32s
Details
Test / test_add_osd (push) Successful in 2m37s
Details
Test / test_cas (push) Successful in 9s
Details
Test / test_change_pg_count (push) Successful in 38s
Details
Test / test_change_pg_count_ec (push) Successful in 38s
Details
Test / test_change_pg_size (push) Successful in 9s
Details
Test / test_create_nomaxid (push) Successful in 8s
Details
Test / test_etcd_fail (push) Successful in 53s
Details
Test / test_failure_domain (push) Successful in 15s
Details
Test / test_interrupted_rebalance (push) Successful in 2m3s
Details
Test / test_interrupted_rebalance_imm (push) Successful in 2m55s
Details
Test / test_interrupted_rebalance_ec (push) Successful in 2m43s
Details
Test / test_interrupted_rebalance_ec_imm (push) Successful in 1m31s
Details
Test / test_minsize_1 (push) Successful in 14s
Details
Test / test_move_reappear (push) Successful in 17s
Details
Test / test_rebalance_verify (push) Successful in 3m9s
Details
Test / test_rebalance_verify_imm (push) Successful in 3m10s
Details
Test / test_rebalance_verify_ec (push) Successful in 3m15s
Details
Test / test_rebalance_verify_ec_imm (push) Successful in 4m45s
Details
Test / test_rm (push) Successful in 18s
Details
Test / test_snapshot (push) Successful in 35s
Details
Test / test_snapshot_ec (push) Successful in 18s
Details
Test / test_splitbrain (push) Successful in 15s
Details
Test / test_write (push) Successful in 35s
Details
Test / test_write_xor (push) Successful in 1m12s
Details
Test / test_write_no_same (push) Successful in 15s
Details
Test / test_heal_pg_size_2 (push) Successful in 3m41s
Details
Test / test_scrub (push) Successful in 33s
Details
Test / test_scrub_zero_osd_2 (push) Successful in 29s
Details
Test / test_scrub_xor (push) Successful in 30s
Details
Test / test_scrub_pg_size_3 (push) Successful in 51s
Details
Test / test_scrub_pg_size_6_pg_minsize_4_osd_count_6_ec (push) Successful in 31s
Details
Test / test_scrub_ec (push) Successful in 26s
Details
Test / test_heal_ec (push) Successful in 3m21s
Details
Test / buildenv (push) Successful in 9s
Details
Test / build (push) Successful in 2m36s
Details
Test / make_test (push) Successful in 32s
Details
Test / test_add_osd (push) Successful in 2m37s
Details
Test / test_cas (push) Successful in 9s
Details
Test / test_change_pg_count (push) Successful in 38s
Details
Test / test_change_pg_count_ec (push) Successful in 38s
Details
Test / test_change_pg_size (push) Successful in 9s
Details
Test / test_create_nomaxid (push) Successful in 8s
Details
Test / test_etcd_fail (push) Successful in 53s
Details
Test / test_failure_domain (push) Successful in 15s
Details
Test / test_interrupted_rebalance (push) Successful in 2m3s
Details
Test / test_interrupted_rebalance_imm (push) Successful in 2m55s
Details
Test / test_interrupted_rebalance_ec (push) Successful in 2m43s
Details
Test / test_interrupted_rebalance_ec_imm (push) Successful in 1m31s
Details
Test / test_minsize_1 (push) Successful in 14s
Details
Test / test_move_reappear (push) Successful in 17s
Details
Test / test_rebalance_verify (push) Successful in 3m9s
Details
Test / test_rebalance_verify_imm (push) Successful in 3m10s
Details
Test / test_rebalance_verify_ec (push) Successful in 3m15s
Details
Test / test_rebalance_verify_ec_imm (push) Successful in 4m45s
Details
Test / test_rm (push) Successful in 18s
Details
Test / test_snapshot (push) Successful in 35s
Details
Test / test_snapshot_ec (push) Successful in 18s
Details
Test / test_splitbrain (push) Successful in 15s
Details
Test / test_write (push) Successful in 35s
Details
Test / test_write_xor (push) Successful in 1m12s
Details
Test / test_write_no_same (push) Successful in 15s
Details
Test / test_heal_pg_size_2 (push) Successful in 3m41s
Details
Test / test_scrub (push) Successful in 33s
Details
Test / test_scrub_zero_osd_2 (push) Successful in 29s
Details
Test / test_scrub_xor (push) Successful in 30s
Details
Test / test_scrub_pg_size_3 (push) Successful in 51s
Details
Test / test_scrub_pg_size_6_pg_minsize_4_osd_count_6_ec (push) Successful in 31s
Details
Test / test_scrub_ec (push) Successful in 26s
Details
parent
aa5dacc7a9
commit
1c2df841c2
|
@ -115,6 +115,10 @@ int osd_t::pick_next_scrub(object_id & next_oid)
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
if (scrub_list_op)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
timespec tv_now;
|
||||
clock_gettime(CLOCK_REALTIME, &tv_now);
|
||||
bool rescan = scrub_last_pg.pool_id != 0 || scrub_last_pg.pg_num != 0;
|
||||
|
|
Loading…
Reference in New Issue