Skip to content

DAOS-17973 control: Allow none for pool property self_heal (#16848) #17217

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: release/2.6
Choose a base branch
from
+21 −3
Draft

DAOS-17973 control: Allow none for pool property self_heal (#16848) #17217

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
16 changes: 15 additions & 1 deletion src/control/cmd/dmg/pool_test.go
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 @@ -771,6 +771,20 @@ func TestPoolCommands(t *testing.T) {
}, " "),
nil,
},
{
"Set pool properties with self_heal value 'none'",
`pool set-prop 031bcaf8-f0f5-42ef-b3c5-ee048676dceb self_heal:none,space_rb:42`,
strings.Join([]string{
printRequest(t, &control.PoolSetPropReq{
ID: "031bcaf8-f0f5-42ef-b3c5-ee048676dceb",
Properties: []*daos.PoolProperty{
propWithVal("self_heal", "none"),
propWithVal("space_rb", "42"),
},
}),
}, " "),
nil,
},
{
"Set pool properties with pool flag",
"pool set-prop 031bcaf8-f0f5-42ef-b3c5-ee048676dceb label:foo,space_rb:42",
Expand Down
5 changes: 4 additions & 1 deletion src/control/lib/daos/pool_property.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// (C) Copyright 2021-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 @@ -53,6 +53,8 @@ func PoolProperties() PoolPropertyMap {
return "not set"
}
switch n {
case 0:
return "none"
case PoolSelfHealingAutoExclude:
return "exclude"
case PoolSelfHealingAutoRebuild:
Expand All @@ -69,6 +71,7 @@ func PoolProperties() PoolPropertyMap {
},
},
values: map[string]uint64{
"none": 0,
"exclude": PoolSelfHealingAutoExclude,
"rebuild": PoolSelfHealingAutoRebuild,
"delay_rebuild": PoolSelfHealingDelayRebuild,
Expand Down
3 changes: 2 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,5 +1,6 @@
/**
* (C) Copyright 2016-2023 Intel Corporation.
* (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -735,7 +736,7 @@ pool_op_retry(void **state)
/* pool set prop success committed, "lost" reply - duplicate RPC retry */
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", "rebuild");
rc = daos_pool_set_prop(arg->pool.pool_uuid, "self_heal", "none");
assert_rc_equal(rc, 0);
print_message("success\n");

Expand Down
Loading