Skip to content

DAOS-18478 tests: Fix daos_test POOL13 #17401

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
liw wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −3
Draft

DAOS-18478 tests: Fix daos_test POOL13 #17401

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
8 changes: 7 additions & 1 deletion src/tests/suite/daos_pool.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 @@ -734,11 +734,17 @@ pool_op_retry(void **state)
print_message("success\n");

/* pool set prop success committed, "lost" reply - duplicate RPC retry */
char *orig_self_heal = NULL;
rc = daos_pool_get_prop(arg->pool.pool_uuid, "self_heal", &orig_self_heal);
assert_rc_equal(rc, 0);
test_set_engine_fail_loc(arg, leader_rank, DAOS_MD_OP_PASS_NOREPLY | DAOS_FAIL_ONCE);
print_message("set pool prop (retry / dup rpc detection)... ");
rc = daos_pool_set_prop(arg->pool.pool_uuid, "self_heal", "none");
assert_rc_equal(rc, 0);
print_message("success\n");
rc = daos_pool_set_prop(arg->pool.pool_uuid, "self_heal", orig_self_heal);
assert_rc_equal(rc, 0);
free(orig_self_heal);

/* pool evict success committed, "lost" reply - duplicate RPC retry */
test_set_engine_fail_loc(arg, leader_rank, DAOS_MD_OP_PASS_NOREPLY | DAOS_FAIL_ONCE);
Expand Down
4 changes: 3 additions & 1 deletion src/tests/suite/daos_test.h
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 @@ -428,6 +428,8 @@ void
test_rebuild_wait_to_error(test_arg_t **args, int args_cnt);
int daos_pool_set_prop(const uuid_t pool_uuid, const char *name,
const char *value);
int
daos_pool_get_prop(const uuid_t pool_uuid, const char *name, char **value_out);

int daos_pool_upgrade(const uuid_t pool_uuid);
int ec_data_nr_get(daos_obj_id_t oid);
Expand Down
8 changes: 7 additions & 1 deletion src/tests/suite/daos_test_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* (C) Copyright 2018-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 @@ -1121,6 +1121,12 @@ daos_pool_set_prop(const uuid_t pool_uuid, const char *name,
return dmg_pool_set_prop(dmg_config_file, name, value, pool_uuid);
}

int
daos_pool_get_prop(const uuid_t pool_uuid, const char *name, char **value_out)
{
return dmg_pool_get_prop(dmg_config_file, NULL, pool_uuid, name, value_out);
}

void
daos_start_server(test_arg_t *arg, const uuid_t pool_uuid,
const char *grp, d_rank_list_t *svc, d_rank_t rank)
Expand Down
Loading