-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path0.11.1..356cb83d36a9243e30fe8a1bbc83e81fc46d2be2.patch
More file actions
44 lines (43 loc) · 2.15 KB
/
0.11.1..356cb83d36a9243e30fe8a1bbc83e81fc46d2be2.patch
File metadata and controls
44 lines (43 loc) · 2.15 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
diff --git a/src/common/mfu_daos.c b/src/common/mfu_daos.c
index 8f53133..b870978 100644
--- a/src/common/mfu_daos.c
+++ b/src/common/mfu_daos.c
@@ -1182,7 +1182,9 @@ int daos_connect(
* If nothing is passed in for destination a uuid is always generated
* unless user passed one in, because destination container labels are
* not generated */
- rc = daos_cont_open(*poh, da->dst_cont_uuid, DAOS_COO_RW, coh, &co_info, NULL);
+ char cont_str[130];
+ uuid_unparse(da->dst_cont_uuid, cont_str);
+ rc = daos_cont_open(*poh, cont_str, DAOS_COO_RW, coh, &co_info, NULL);
} else {
rc = daos_cont_open(*poh, *cont, DAOS_COO_RW, coh, &co_info, NULL);
}
@@ -1273,14 +1275,12 @@ int daos_connect(
}
/* try to open it again */
- if (dst_cont_passed) {
- if (is_uuid) {
- rc = daos_cont_open(*poh, da->dst_cont_uuid, DAOS_COO_RW, coh, &co_info, NULL);
- } else {
- rc = daos_cont_open(*poh, *cont, DAOS_COO_RW, coh, &co_info, NULL);
- }
+ if (dst_cont_passed && !is_uuid) {
+ rc = daos_cont_open(*poh, *cont, DAOS_COO_RW, coh, &co_info, NULL);
} else {
- rc = daos_cont_open(*poh, da->dst_cont_uuid, DAOS_COO_RW, coh, &co_info, NULL);
+ char cont_str[130];
+ uuid_unparse(da->dst_cont_uuid, cont_str);
+ rc = daos_cont_open(*poh, cont_str, DAOS_COO_RW, coh, &co_info, NULL);
}
if (rc != 0) {
MFU_LOG(MFU_LOG_ERR, "Failed to open container: "DF_RC, DP_RC(rc));
@@ -5617,7 +5617,7 @@ int daos_cont_deserialize_connect(daos_args_t *daos_args,
} else {
uuid_unparse(daos_args->dst_cont_uuid, cont_str);
MFU_LOG(MFU_LOG_INFO, "Successfully created container %s", cont_str);
- rc = daos_cont_open(daos_args->src_poh, daos_args->dst_cont_uuid,
+ rc = daos_cont_open(daos_args->src_poh, cont_str,
DAOS_COO_RW, &daos_args->src_coh, &co_info, NULL);
}
if (rc != 0) {