Skip to content

Commit 66d3573

Browse files
authored
DAOS-16355 pydaos: fix dir obj cache invalid handle error (#15997)
Directory objects lifecycle is defined by cache, releasing object outside it will result in the error: Invalid object handler. Signed-off-by: Denis Barakhtanov <dbarahtanov@enakta.com>
1 parent 7355706 commit 66d3573

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

src/client/pydaos/torch/torch_shim.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,10 +556,6 @@ __shim_handle__torch_list_with_anchor(PyObject *self, PyObject *args)
556556
D_FREE(dentries);
557557
D_FREE(stats);
558558

559-
if (obj) {
560-
rc = dfs_release(obj);
561-
}
562-
563559
return PyLong_FromLong(rc);
564560
}
565561

src/tests/ftest/pytorch/dataset.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,18 @@ def test_map_style_dataset(self):
4141
subdirs = self.params.get("subdirs", "/run/map_style_dataset/*")
4242
files_per_node = self.params.get("files_per_node", "/run/map_style_dataset/*")
4343
file_min_size = self.params.get("file_min_size", "/run/map_style_dataset/*", 4096)
44-
file_max_size = self.params.get("file_max_size", "/run/map_style_dataset/*", 128 * 1024)
44+
file_max_size = self.params.get("file_max_size", "/run/map_style_dataset/*", 4096)
45+
readdir_batch_size = self.params.get("readdir_batch_size", "/run/map_style_dataset/*", 5)
4546

4647
self._create_test_files(root_dir, height, subdirs, files_per_node,
4748
file_min_size, file_max_size)
4849

4950
expected = self._get_test_files_hashmap(root_dir, self.hostlist_clients)
5051

51-
dataset = Dataset(pool.identifier, container.identifier)
52+
dataset = Dataset(pool=pool.identifier,
53+
cont=container.identifier,
54+
readdir_batch_size=readdir_batch_size,
55+
)
5256

5357
actual = {}
5458
for _, content in enumerate(dataset):

src/tests/ftest/pytorch/dataset.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
hosts:
2-
test_servers: 1
2+
test_servers: 2
33
test_clients: 1
44
server_config:
55
name: daos_server
@@ -18,17 +18,18 @@ pool:
1818
container:
1919
type: POSIX
2020
control_method: daos
21+
dir_oclass: SX
2122

22-
timeout: 180
23+
timeout: 270
2324

2425
map_style_dataset:
25-
tree_height: 4
26-
subdirs: 3
27-
files_per_node: 5
26+
tree_height: 2
27+
subdirs: 2
28+
files_per_node: 64
2829

2930
iterable_dataset:
30-
tree_height: 3
31-
subdirs: 3
31+
tree_height: 4
32+
subdirs: 5
3233
files_per_node: 6
3334

3435
map_dataset_with_dataloader:

0 commit comments

Comments
 (0)