Skip to content

DAOS-16759 test: extend_simple wait for rebuild start before FI clear… #18813

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
kccain wants to merge 1 commit into
base: release/2.8
Choose a base branch
from
+29 −7
Open

DAOS-16759 test: extend_simple wait for rebuild start before FI clear… #18813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions src/tests/suite/daos_extend_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* (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 @@ -180,8 +180,13 @@ dfs_extend_internal(void **state, int opc, test_rebuild_cb_t extend_cb, bool kil
daos_debug_set_params(arg->group, -1, DMG_KEY_FAIL_LOC,
DAOS_REBUILD_TGT_SCAN_HANG | DAOS_FAIL_ALWAYS, 0, NULL);

arg->no_rebuild =
1; /* This has no effect for RB_OP_TYPE_ADD - so can this be removed here? */
/*
* For RB_OP_TYPE_ADD, rebuild_targets() still performs the extend and invokes
* rebuild_cb, but no_rebuild=1 disables its internal waits
* (test_rebuild_wait_to_start_next/test_rebuild_wait). Therefore,
* extend_single_pool_rank() returns without waiting for rebuild completion.
*/
arg->no_rebuild = 1;
extend_single_pool_rank(arg, extend_rank);
arg->no_rebuild = 0;

Expand Down
25 changes: 21 additions & 4 deletions src/tests/suite/daos_extend_simple.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* (C) Copyright 2016-2023 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 @@ -247,8 +247,17 @@ extend_cb_internal(void *arg)
int rc;
int i;

print_message("Extending, sleep 10, %s another rank %u, and start op %d (%s)\n", pre_op,
cb_arg->rank, opc, extend_opstrs[opc]);
/* Wait for first extend to start (immediate return expected since it's running).
* We want a post-effect: test_arg->pool.pool_info.pi_rebuild_st has the first rs_version.
* Then later we can wait for the second rebuild to start with another similar call.
*/
print_message("before waiting for rebuild to start, pmap_ver=%u, rs_version=%u\n",
test_arg->pool.pool_info.pi_map_ver,
test_arg->pool.pool_info.pi_rebuild_st.rs_version);
test_rebuild_wait_to_start_next(&test_arg, 1);
print_message("Extending (rs_version=%u), sleep 10, %s rank %u, and start op %d (%s)\n",
test_arg->pool.pool_info.pi_rebuild_st.rs_version, pre_op, cb_arg->rank, opc,
extend_opstrs[opc]);

sleep(10);

Expand Down Expand Up @@ -314,7 +323,15 @@ extend_cb_internal(void *arg)
break;
}

daos_debug_set_params(test_arg->group, -1, DMG_KEY_FAIL_LOC, 0, 0, NULL);
if (cb_arg->kill) {
print_message(
"extend_cb_internal: waiting for next rebuild start before clearing FI\n");
test_rebuild_wait_to_start_next(&test_arg, 1);
}

print_message("extend_cb_internal: clear FI via daos_debug_set_params()\n");
rc = daos_debug_set_params(test_arg->group, -1, DMG_KEY_FAIL_LOC, 0, 0, NULL);
assert_success(rc);

return 0;
}
Expand Down
Loading