Skip to content

DAOS-18866 vos: unconditional punch fix #18219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NiuYawei wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −0
Open

DAOS-18866 vos: unconditional punch fix #18219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6316661
DAOS-18866 vos: unconditional punch fix
NiuYawei May 12, 2026
11f643e
Merge branch 'master' into niu/DAOS-18866
NiuYawei May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/vos/vos_obj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,16 @@ vos_obj_punch(daos_handle_t coh, daos_unit_oid_t oid, daos_epoch_t epoch,
if (rc != 0)
goto reset;

if (!(hold_flags & VOS_OBJ_CREATE) && (obj->obj_df == NULL)) {
rc = vos_ilog_ts_add(ts_set, NULL, &oid, sizeof(oid));
D_ASSERT(rc == 0);

rc = -DER_NONEXIST;
vos_obj_release(obj, 0, true);
obj = NULL;
goto reset;
}

rc = vos_tx_begin(dth, vos_cont2umm(cont), cont->vc_pool->vp_sysdb, obj);
if (rc != 0)
goto reset;
Expand Down
2 changes: 2 additions & 0 deletions src/vos/vos_obj_cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,8 @@ vos_obj_incarnate(struct vos_object *obj, daos_epoch_range_t *epr, daos_epoch_t
if (rc == 0) {
obj->obj_sync_epoch = obj->obj_df->vo_sync;
} else if (rc == -DER_NONEXIST) {
if (!(flags & VOS_OBJ_CREATE))
return -DER_NONEXIST;
rc = vos_oi_alloc(cont, obj->obj_id, epr->epr_hi, &obj->obj_df, ts_set);
if (rc) {
DL_ERROR(rc, DF_CONT ": Failed to allocate OI " DF_UOID ".",
Expand Down
Loading