Erase verf key left from creation from ientries on every modification
Test / buildenv (push) Successful in 10s Details
Test / build (push) Successful in 2m57s Details
Test / test_cas (push) Successful in 8s Details
Test / make_test (push) Successful in 32s Details
Test / test_change_pg_count (push) Successful in 32s Details
Test / test_change_pg_size (push) Successful in 6s Details
Test / test_change_pg_count_ec (push) Successful in 31s Details
Test / test_create_nomaxid (push) Successful in 7s Details
Test / test_etcd_fail (push) Successful in 51s Details
Test / test_add_osd (push) Successful in 2m37s Details
Test / test_interrupted_rebalance (push) Successful in 1m56s Details
Test / test_interrupted_rebalance_imm (push) Successful in 1m54s Details
Test / test_failure_domain (push) Successful in 37s Details
Test / test_interrupted_rebalance_ec (push) Successful in 2m6s Details
Test / test_snapshot (push) Successful in 54s Details
Test / test_snapshot_ec (push) Successful in 24s Details
Test / test_minsize_1 (push) Successful in 15s Details
Test / test_rm (push) Successful in 14s Details
Test / test_move_reappear (push) Successful in 20s Details
Test / test_interrupted_rebalance_ec_imm (push) Successful in 1m28s Details
Test / test_snapshot_down (push) Successful in 23s Details
Test / test_snapshot_down_ec (push) Successful in 26s Details
Test / test_splitbrain (push) Successful in 16s Details
Test / test_snapshot_chain (push) Successful in 2m15s Details
Test / test_snapshot_chain_ec (push) Successful in 2m37s Details
Test / test_rebalance_verify_imm (push) Successful in 2m40s Details
Test / test_rebalance_verify (push) Successful in 3m0s Details
Test / test_switch_primary (push) Successful in 33s Details
Test / test_write (push) Successful in 58s Details
Test / test_write_xor (push) Successful in 47s Details
Test / test_write_no_same (push) Successful in 14s Details
Test / test_rebalance_verify_ec_imm (push) Successful in 3m42s Details
Test / test_rebalance_verify_ec (push) Successful in 4m55s Details
Test / test_heal_pg_size_2 (push) Successful in 3m34s Details
Test / test_heal_ec (push) Successful in 3m29s Details
Test / test_heal_csum_32k_dmj (push) Successful in 5m35s Details
Test / test_heal_csum_32k_dj (push) Successful in 6m20s Details
Test / test_heal_csum_4k_dmj (push) Successful in 6m41s Details
Test / test_heal_csum_32k (push) Successful in 6m44s Details
Test / test_scrub_zero_osd_2 (push) Successful in 57s Details
Test / test_scrub_xor (push) Successful in 58s Details
Test / test_heal_csum_4k_dj (push) Successful in 6m12s Details
Test / test_scrub (push) Failing after 3m8s Details
Test / test_heal_csum_4k (push) Successful in 5m17s Details
Test / test_scrub_pg_size_3 (push) Successful in 1m49s Details
Test / test_scrub_ec (push) Successful in 41s Details
Test / test_scrub_pg_size_6_pg_minsize_4_osd_count_6_ec (push) Successful in 47s Details
Test / test_nfs (push) Successful in 11s Details

Vitaliy Filippov 2024-03-12 00:51:24 +03:00
parent 22f717e62c
commit e5782240c7
4 changed files with 11 additions and 3 deletions

View File

@ -281,9 +281,10 @@ static void touch_inode(nfs_proxy_t *proxy, inode_t ino, bool allow_cache)
{
if (!res)
{
auto acopy = attrs.object_items();
acopy["mtime"] = nfstime_now_str();
proxy->db->set(kv_inode_key(ino), json11::Json(acopy).dump(), [proxy, ino](int res)
auto ientry = attrs.object_items();
ientry["mtime"] = nfstime_now_str();
ientry.erase("verf");
proxy->db->set(kv_inode_key(ino), json11::Json(ientry).dump(), [proxy, ino](int res)
{
if (res == -EAGAIN)
{

View File

@ -238,6 +238,7 @@ resume_7:
{
auto copy = st->new_ientry.object_items();
copy["nlink"] = st->new_ientry["nlink"].uint64_value()-1;
copy.erase("verf");
st->self->parent->db->set(kv_inode_key(st->new_direntry["ino"].uint64_value()), json11::Json(copy).dump(), [st](int res)
{
st->res = res;
@ -324,6 +325,7 @@ resume_11:
{
auto ientry_new = st->old_ientry.object_items();
ientry_new["parent_ino"] = st->new_dir_ino;
ientry_new.erase("verf");
st->self->parent->db->set(kv_inode_key(st->old_direntry["ino"].uint64_value()), json11::Json(ientry_new).dump(), [st](int res)
{
st->res = res;

View File

@ -71,6 +71,7 @@ resume_1:
}
st->new_attrs[kv.first] = kv.second;
}
st->new_attrs.erase("verf");
st->self->parent->db->set(kv_inode_key(st->ino), json11::Json(st->new_attrs).dump(), [st](int res)
{
st->res = res;

View File

@ -546,6 +546,7 @@ static std::string new_normal_ientry(nfs_kv_write_state *st)
ni.erase("shared_ver");
ni["size"] = st->ext->cur_extend;
ni["mtime"] = nfstime_now_str();
ni.erase("verf");
return json11::Json(ni).dump();
}
@ -559,6 +560,7 @@ static std::string new_moved_ientry(nfs_kv_write_state *st)
ni.erase("shared_ver");
ni["size"] = st->new_size;
ni["mtime"] = nfstime_now_str();
ni.erase("verf");
return json11::Json(ni).dump();
}
@ -569,6 +571,7 @@ static std::string new_shared_ientry(nfs_kv_write_state *st)
ni["size"] = st->new_size;
ni["mtime"] = nfstime_now_str();
ni["shared_ver"] = ni["shared_ver"].uint64_value()+1;
ni.erase("verf");
return json11::Json(ni).dump();
}
@ -581,6 +584,7 @@ static std::string new_unshared_ientry(nfs_kv_write_state *st)
ni.erase("shared_alloc");
ni.erase("shared_ver");
ni["mtime"] = nfstime_now_str();
ni.erase("verf");
return json11::Json(ni).dump();
}