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-17094 test: DO NOT LAND - larger ABT stack, class: ram #16033

Closed
wants to merge 3 commits into from
Closed

DAOS-17094 test: DO NOT LAND - larger ABT stack, class: ram #16033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9e659a
Revert "DAOS-17094 container: increase stack size of cont_refresh_tra…
kccain Mar 5, 2025
5365de8
Revert "DAOS-16768 pool: larger ABT ULT stack sizes (#15822)"
kccain Mar 5, 2025
45d186f
DAOS-17094 test: DO NOT LAND - larger ABT stack, class: ram
kccain Mar 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
6 changes: 3 additions & 3 deletions src/container/srv_container.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1863,9 +1863,9 @@ ds_cont_tgt_refresh_track_eph(uuid_t pool_uuid, uuid_t cont_uuid,
arg.tgt_status[i] = tgts[i].ta_comp.co_status;
ds_pool_put(pool);

rc = ds_pool_thread_collective(
pool_uuid, PO_COMP_ST_NEW | PO_COMP_ST_DOWN | PO_COMP_ST_DOWNOUT,
cont_refresh_track_eph_one, &arg, DSS_ULT_DEEP_STACK | DSS_ULT_FL_PERIODIC);
rc = ds_pool_thread_collective(pool_uuid,
PO_COMP_ST_NEW | PO_COMP_ST_DOWN | PO_COMP_ST_DOWNOUT,
cont_refresh_track_eph_one, &arg, DSS_ULT_FL_PERIODIC);

out:
if (arg.tgt_status != NULL && arg.tgt_status != arg.tgt_status_inline)
Expand Down
11 changes: 5 additions & 6 deletions src/container/srv_target.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,9 +1809,8 @@ ds_cont_tgt_open(uuid_t pool_uuid, uuid_t cont_hdl_uuid,
DP_UUID(pool_uuid), DP_UUID(cont_uuid), DP_UUID(cont_hdl_uuid));

retry:
rc = ds_pool_thread_collective(pool_uuid,
PO_COMP_ST_NEW | PO_COMP_ST_DOWN | PO_COMP_ST_DOWNOUT,
cont_open_one, &arg, DSS_ULT_DEEP_STACK);
rc = ds_pool_thread_collective(pool_uuid, PO_COMP_ST_NEW | PO_COMP_ST_DOWN |
PO_COMP_ST_DOWNOUT, cont_open_one, &arg, 0);
if (rc != 0) {
if (rc == -DER_AGAIN) {
dss_sleep(50);
Expand Down Expand Up @@ -2123,9 +2122,9 @@ ds_cont_tgt_snapshots_update(uuid_t pool_uuid, uuid_t cont_uuid,
* the up targets in this scenario. The target property will be updated
* upon initiating container aggregation.
*/
return ds_pool_thread_collective(
pool_uuid, PO_COMP_ST_NEW | PO_COMP_ST_DOWN | PO_COMP_ST_DOWNOUT | PO_COMP_ST_UP,
cont_snap_update_one, &args, DSS_ULT_DEEP_STACK);
return ds_pool_thread_collective(pool_uuid, PO_COMP_ST_NEW | PO_COMP_ST_DOWN |
PO_COMP_ST_DOWNOUT | PO_COMP_ST_UP,
cont_snap_update_one, &args, 0);
}

void
Expand Down
5 changes: 2 additions & 3 deletions src/pool/srv_target.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2256,9 +2256,8 @@ ds_pool_tgt_prop_update(struct ds_pool *pool, struct pool_iv_prop *iv_prop)
arg.uvp_checkpoint_props_changed = 1;
}

ret = ds_pool_thread_collective(pool->sp_uuid,
PO_COMP_ST_DOWN | PO_COMP_ST_DOWNOUT | PO_COMP_ST_NEW,
update_vos_prop_on_targets, &arg, DSS_ULT_DEEP_STACK);
ret = ds_pool_thread_collective(pool->sp_uuid, PO_COMP_ST_DOWN | PO_COMP_ST_DOWNOUT |
PO_COMP_ST_NEW, update_vos_prop_on_targets, &arg, 0);
if (ret != 0)
return ret;

Expand Down
3 changes: 2 additions & 1 deletion src/tests/ftest/launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python3
"""
(C) Copyright 2018-2024 Intel Corporation.
(C) Copyright 2025 Hewlett Packard Enterprise Development LP

SPDX-License-Identifier: BSD-2-Clause-Patent
"""
Expand Down Expand Up @@ -32,7 +33,7 @@
from util.yaml_utils import YamlException

DEFAULT_LOGS_THRESHOLD = "2150M" # 2.1G
MAX_CI_REPETITIONS = 10
MAX_CI_REPETITIONS = 30


class LaunchError(Exception):
Expand Down
7 changes: 6 additions & 1 deletion src/tests/ftest/server/daos_server_restart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
"""
(C) Copyright 2020-2022 Intel Corporation.
(C) Copyright 2025 Hewlett Packard Enterprise Development LP

SPDX-License-Identifier: BSD-2-Clause-Patent
"""
import time

from apricot import TestWithServers
from avocado import fail_on
from exception_utils import CommandFailure
Expand Down Expand Up @@ -148,7 +151,9 @@ def test_engine_restart(self):
self.restart_engine()
self.log.info("(3) Force shutdown and restart the daos engine.")
self.restart_engine()
self.log.info("(4) Verify pool list after forced shutdown and restart the daos engine.")
self.log.info("(4) Verify pool list after forced shutdown and restart the daos engine, and "
"a small delay.")
time.sleep(10)
self.verify_pool_list(pool_list)
hosts = self.hostlist_servers
self.hostlist_servers = hosts[-1]
Expand Down
4 changes: 4 additions & 0 deletions src/tests/ftest/server/daos_server_restart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ server_config:
engines_per_host: 2
engines:
0:
env_vars:
- ABT_THREAD_STACKSIZE=20480
pinned_numa_node: 0
nr_xs_helpers: 1
fabric_iface: ib0
Expand All @@ -23,6 +25,8 @@ server_config:
class: ram
scm_mount: /mnt/daos0
1:
env_vars:
- ABT_THREAD_STACKSIZE=20480
pinned_numa_node: 1
nr_xs_helpers: 1
fabric_iface: ib1
Expand Down
Loading