Skip to content
Open
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions src/object/srv_obj_migrate.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* (C) Copyright 2019-2024 Intel Corporation.
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
* (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -752,6 +752,7 @@ mrone_obj_fetch_internal(struct migrate_one *mrone, daos_handle_t oh, d_sg_list_
d_iov_t *csum_iov_fetch, struct migrate_pool_tls *tls)
{
uint32_t *extra_arg = NULL;
int waited = 0;
int rc;

/* pass rebuild epoch by extra_arg */
Expand All @@ -760,11 +761,10 @@ mrone_obj_fetch_internal(struct migrate_one *mrone, daos_handle_t oh, d_sg_list_
mrone->mo_epoch);
extra_arg = (uint32_t *)mrone->mo_epoch;
}

retry:
rc = dsc_obj_fetch(oh, eph, &mrone->mo_dkey, iod_num, iods, sgls, NULL, flags, extra_arg,
csum_iov_fetch);
if ((rc == -DER_TIMEDOUT || rc == -DER_FETCH_AGAIN) &&
if ((rc == -DER_TIMEDOUT || rc == -DER_FETCH_AGAIN || rc == -DER_NOMEM) &&
tls->mpt_version + 1 >= tls->mpt_pool->spc_map_version) {
if (tls->mpt_fini) {
DL_ERROR(rc, DF_RB ": dsc_obj_fetch " DF_UOID "failed when mpt_fini",
Expand All @@ -776,6 +776,17 @@ mrone_obj_fetch_internal(struct migrate_one *mrone, daos_handle_t oh, d_sg_list_
*/
D_WARN(DF_UUID" retry "DF_UOID" "DF_RC"\n",
DP_UUID(tls->mpt_pool_uuid), DP_UOID(mrone->mo_oid), DP_RC(rc));
if (rc == -DER_NOMEM) {
/* sleep 10 seconds before retry, give other layers a chance to
* release resources.
*/
dss_sleep(10 * 1000);
if (waited != 0 && waited % 3600 == 0) {
DL_ERROR(rc, DF_RB ": waited for memory for %d hour(s)",
DP_RB_MPT(tls), waited / 3600);
}
}
waited += 10;
D_GOTO(retry, rc);
}

Expand Down
Loading