Skip to content
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

DAOS-17001 rebuild: when self_heal is set to delay_rebuild, do not re… #15809

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

DAOS-17001 rebuild: when self_heal is set to delay_rebuild, do not re… #15809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cbddbb5
DAOS-17001 rebuild: when self_heal is set to delay_rebuild, do not re…
cdavis28 Jan 29, 2025
401d508
apply review comments
cdavis28 Jan 29, 2025
adb8d21
Check for MAP_EXCLUDE/MAP_DRAIN instead of POOL_EXCLUDE
cdavis28 Jan 30, 2025
23f1014
Features: rebuild
cdavis28 Feb 3, 2025
3aa1aa2
retest
cdavis28 Feb 5, 2025
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
3 changes: 2 additions & 1 deletion src/object/cli_obj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* (C) Copyright 2016-2024 Intel Corporation.
* (C) Copyright 2025 Google LLC
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -5816,7 +5817,7 @@ dc_obj_update(tse_task_t *task, struct dtx_epoch *epoch, uint32_t map_ver,

rc = obj_update_shards_get(obj, args, map_ver, obj_auxi, &shard, &shard_cnt);
if (rc != 0) {
D_ERROR(DF_OID" get update shards failure %d\n", DP_OID(obj->cob_md.omd_id), rc);
D_WARN(DF_OID " get update shards failure %d\n", DP_OID(obj->cob_md.omd_id), rc);
D_GOTO(out_task, rc);
}

Expand Down
5 changes: 3 additions & 2 deletions src/pool/srv_pool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* (C) Copyright 2016-2024 Intel Corporation.
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
* (C) Copyright 2025 Google LLC
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -7350,7 +7351,7 @@ pool_svc_update_map(struct pool_svc *svc, crt_opcode_t opc, bool exclude_rank,

if (svc->ps_pool->sp_reint_mode == DAOS_REINT_MODE_NO_DATA_SYNC) {
D_DEBUG(DB_MD, "self healing is disabled for no_data_sync reintegration mode.\n");
if (opc == POOL_EXCLUDE || opc == POOL_DRAIN) {
if (opc == MAP_EXCLUDE || opc == MAP_DRAIN) {
rc = ds_pool_tgt_exclude_out(svc->ps_pool->sp_uuid, &target_list);
if (rc)
D_INFO("mark failed target %d of "DF_UUID " as DOWNOUT: "DF_RC"\n",
Expand All @@ -7360,7 +7361,7 @@ pool_svc_update_map(struct pool_svc *svc, crt_opcode_t opc, bool exclude_rank,
D_GOTO(out, rc);
}

if ((entry->dpe_val & DAOS_SELF_HEAL_DELAY_REBUILD) && exclude_rank)
if ((entry->dpe_val & DAOS_SELF_HEAL_DELAY_REBUILD) && (opc == MAP_EXCLUDE))
delay = -1;
else if (daos_fail_check(DAOS_REBUILD_DELAY))
delay = 5;
Expand Down