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.

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-16768 test: DO NOT LAND #15818

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
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: 6 additions & 5 deletions src/container/srv_target.c
Original file line number Diff line number Diff line change
@@ -1792,8 +1792,9 @@ 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, 0);
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);
if (rc != 0) {
if (rc == -DER_AGAIN) {
dss_sleep(50);
@@ -2105,9 +2106,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, 0);
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);
}

void
5 changes: 3 additions & 2 deletions src/pool/srv_target.c
Original file line number Diff line number Diff line change
@@ -2256,8 +2256,9 @@ 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, 0);
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);
if (ret != 0)
return ret;

3 changes: 2 additions & 1 deletion src/tests/ftest/launch.py
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
"""
@@ -32,7 +33,7 @@
from util.yaml_utils import YamlException

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


class LaunchError(Exception):
7 changes: 6 additions & 1 deletion src/tests/ftest/server/daos_server_restart.py
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
@@ -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]