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-16495 test: Use the test env control config file w/ dmg #15094

Merged
merged 6 commits into from
Sep 18, 2024
Merged

DAOS-16495 test: Use the test env control config file w/ dmg #15094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
52c1b86
DAOS-16495 test: Use the test env control config file w/ dmg
phender Sep 6, 2024
974fdf6
Update harness/config.py server setup for VMs.
phender Sep 6, 2024
0ea1251
Cleaner fix.
phender Sep 6, 2024
6c60662
Merge branch 'master' into pahender/DAOS-16495
phender Sep 17, 2024
8e52e35
Fix control_metadata_path specification for config generate.
phender Sep 17, 2024
008c974
Fix typo.
phender Sep 17, 2024
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
10 changes: 6 additions & 4 deletions src/tests/ftest/control/config_generate_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
SPDX-License-Identifier: BSD-2-Clause-Patent
'''

import os

Copy link
Contributor Author

@phender phender Sep 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isort would complain unless the new line was here for some reason

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's because os is internal and yaml is 3rd-party (pip installed or dnf isntalled) so isort wants those group separately

import yaml
from apricot import TestWithServers
from server_utils import ServerFailed
Expand Down Expand Up @@ -45,16 +47,16 @@ def test_config_generate_run(self):

# use_tmpfs_scm specifies that a MD-on-SSD conf should be generated and control metadata
# path needs to be set in that case.
ext_md_path = ""
control_metadata = None
Copy link
Contributor Author

@phender phender Sep 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should avoid running config generate with an empty --control-metadata-path argument - not that it was causing problems, e.g.

/usr/bin/dmg -o /var/tmp/daos_testing/configs/daos_control.yml -d config generate --access-points=wolf-219 --control-metadata-path= --net-provider=ofi+tcp

if use_tmpfs_scm:
ext_md_path = self.test_env.log_dir
control_metadata = os.path.join(self.test_env.log_dir, 'control_metadata')

# Call dmg config generate. AP is always the first server host.
server_host = self.hostlist_servers[0]
result = self.get_dmg_command().config_generate(
access_points=server_host, num_engines=num_engines, scm_only=scm_only,
net_class=net_class, net_provider=net_provider, use_tmpfs_scm=use_tmpfs_scm,
control_metadata_path=ext_md_path)
control_metadata_path=control_metadata)

try:
generated_yaml = yaml.safe_load(result.stdout)
Expand All @@ -70,7 +72,7 @@ def test_config_generate_run(self):
# Create a new server config from generated_yaml and update SCM-related
# data in engine_params so that the cleanup before the server start
# works.
self.log.info("Copy config to /etc/daos and update engine_params")
self.log.info("Copy config to %s and update engine_params", self.test_env.server_config)
self.server_managers[0].update_config_file_from_file(generated_yaml)

# Start server with the generated config.
Expand Down
2 changes: 2 additions & 0 deletions src/tests/ftest/harness/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ server_config:
engines_per_host: 1
engines:
0:
targets: 4
nr_xs_helpers: 0
storage:
0:
class: ram
Expand Down
3 changes: 2 additions & 1 deletion src/tests/ftest/util/dmg_utils_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from ClusterShell.NodeSet import NodeSet
from command_utils import CommandWithSubCommand, YamlCommand
from command_utils_base import BasicParameter, CommandWithParameters, FormattedParameter
from environment_utils import TestEnvironment
from general_utils import nodeset_append_suffix


Expand All @@ -30,7 +31,7 @@ def __init__(self, path, yaml_cfg=None, hostlist_suffix=None):
self.temporary_file_hosts = NodeSet(gethostname().split(".")[0])

# If specified use the configuration file from the YamlParameters object
default_yaml_file = None
default_yaml_file = TestEnvironment().control_config
if self.yaml is not None and hasattr(self.yaml, "filename"):
default_yaml_file = self.yaml.filename

Expand Down
Loading