...
Code Block | ||||||
---|---|---|---|---|---|---|
| ||||||
git diff util/server_utils.py diff --git a/src/tests/ftest/util/server_utils.py b/src/tests/ftest/util/server_utils.py index 603723e..ddba91a 100644 --- a/src/tests/ftest/util/server_utils.py +++ b/src/tests/ftest/util/server_utils.py @@ -80,7 +80,7 @@ class DaosServerConfig(ObjectWithParameters): self.targets = BasicParameter(None, 8) self.first_core = BasicParameter(None, 0) self.nr_xs_helpers = BasicParameter(None, 2) - self.fabric_iface = BasicParameter(None, "eth0") + self.fabric_iface = BasicParameter(None, "ib0") self.fabric_iface_port = BasicParameter(None, 31416) self.log_mask = BasicParameter(None, "DEBUG,RPC=ERR,MEM=ERR") self.log_file = BasicParameter(None, "/tmp/server.log") @@ -134,9 +134,9 @@ class DaosServerConfig(ObjectWithParameters): # bdev_list: [/tmp/daos-bdev] - generate nvme.conf as follows: # [AIO] # AIO /tmp/aiofile AIO1 4096 - self.scm_mount = BasicParameter(None, "/mnt/daos") + self.scm_mount = BasicParameter(None, "/dev/shm") self.scm_class = BasicParameter(None, "ram") - self.scm_size = BasicParameter(None, 6) + self.scm_size = BasicParameter(None, 90) self.scm_list = BasicParameter(None) self.bdev_class = BasicParameter(None) self.bdev_list = BasicParameter(None) @@ -150,8 +150,8 @@ class DaosServerConfig(ObjectWithParameters): # Parameters self.name = BasicParameter(None, "daos_server") self.port = BasicParameter(None, 10001) - self.provider = BasicParameter(None, "ofi+sockets") - self.socket_dir = BasicParameter(None) # /tmp/daos_sockets + self.provider = BasicParameter(None, "ofi+psm2") + self.socket_dir = BasicParameter(None, "/tmp/daos_sockets") # /tmp/daos_sockets self.nr_hugepages = BasicParameter(None, 4096) self.control_log_mask = BasicParameter(None, "DEBUG") self.control_log_file = BasicParameter(None, "/tmp/daos_control.log") c455-041[knl](1040)$ git diff util/agent_utils.py diff --git a/src/tests/ftest/util/agent_utils.py b/src/tests/ftest/util/agent_utils.py index d8520d0..e5bbe95 100755 --- a/src/tests/ftest/util/agent_utils.py +++ b/src/tests/ftest/util/agent_utils.py @@ -70,8 +70,8 @@ def run_agent(basepath, server_list, client_list=None): # Verify the domain socket directory is present and owned by this user file_checks = ( - ("Server", server_list, "/var/run/daos_server"), - ("Client", client_list, "/var/run/daos_agent"), + ("Server", server_list, "/tmp/daos_sockets"), + ("Client", client_list, "/tmp/daos_agent"), ) for host_type, host_list, directory in file_checks: status, nodeset = check_file_exists(host_list, directory, user) @@ -88,7 +88,8 @@ def run_agent(basepath, server_list, client_list=None): for client in client_list: sessions[client] = subprocess.Popen( ["ssh", client, "-o ConnectTimeout=10", - "{} -i".format(daos_agent_bin)], + "{} -i".format(daos_agent_bin), + "-s /tmp/daos_agent"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) c455-041[knl](1041)$ |
...