Skip to content

DAOS-18512 build: Tag 2.6.4-aurora.p4 #17436

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

Draft
daltonbohning wants to merge 2 commits into
base: release/2.6.4-aurora
Choose a base branch
from
Draft

DAOS-18512 build: Tag 2.6.4-aurora.p4 #17436

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
71c270c
DAOS-18326 rebuild: indefinitely retry for NOMEM error
gnailzenh Jan 21, 2026
7e2493b
DAOS-18512 build: Tag 2.6.4-aurora.p4
daltonbohning Jan 23, 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
2 changes: 1 addition & 1 deletion TAG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.4-aurora.p3
2.6.4-aurora.p4
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
daos (2.6.4-16) unstable; urgency=medium
[ Dalton Bohning ]
* Tag 2.6.4-aurora.p4

-- Dalton Bohning <[email protected]> Fri, 23 Jan 2026 14:00:00 -0800

daos (2.6.4-14) unstable; urgency=medium
[ Mohamad Chaarawi ]
* Tag 2.6.4-aurora.p3
Expand Down
17 changes: 14 additions & 3 deletions src/object/srv_obj_migrate.c
View file
Open in desktop
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
5 changes: 4 additions & 1 deletion utils/rpms/daos.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

Name: daos
Version: 2.6.4
Release: 14%{?relval}%{?dist}
Release: 16%{?relval}%{?dist}
Summary: DAOS Storage Engine

License: BSD-2-Clause-Patent
Expand Down Expand Up @@ -633,6 +633,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
# No files in a shim package

%changelog
* Fri Jan 23 2026 Dalton Bohning <[email protected]> 2.6.4-16
- Tag 2.6.4-aurora.p4

* Fri Jan 16 2026 Mohamad Chaarawi <[email protected]> 2.6.4-14
- Tag 2.6.4-aurora.p3

Expand Down
Loading