diff --git a/src/cart/crt_hg.c b/src/cart/crt_hg.c index c1d1b3a3f9b..789d75ceb31 100644 --- a/src/cart/crt_hg.c +++ b/src/cart/crt_hg.c @@ -672,6 +672,8 @@ crt_get_info_string(bool primary, crt_provider_t provider, int iface_idx, start_port = crt_provider_ctx0_port_get(primary, provider); domain_str = crt_provider_domain_str_get(primary, provider, iface_idx); + D_ASSERTF(provider_str != NULL, "String for provider=%d not found\n", provider); + /* CXI provider uses domain names for info string */ if (provider == CRT_PROV_OFI_CXI) iface_str = NULL; @@ -690,8 +692,7 @@ crt_get_info_string(bool primary, crt_provider_t provider, int iface_idx, D_GOTO(out, rc); } - if (provider_str) - size += strlen(provider_str); + size = strlen(provider_str); if (domain_str) size += strlen(domain_str); if (iface_str) diff --git a/src/client/dfuse/il/int_posix.c b/src/client/dfuse/il/int_posix.c index 71d0726dda6..3609adcb5fc 100644 --- a/src/client/dfuse/il/int_posix.c +++ b/src/client/dfuse/il/int_posix.c @@ -2522,15 +2522,9 @@ dfuse_fputs(char *__str, FILE *stream) if (drop_reference_if_disabled(entry)) goto do_real_fn; - D_ERROR("Unsupported function\n"); - - entry->fd_err = ENOTSUP; - + DISABLE_STREAM(entry, stream); vector_decref(&fd_table, entry); - errno = ENOTSUP; - return EOF; - do_real_fn: return __real_fputs(__str, stream); } @@ -2553,13 +2547,9 @@ dfuse_fputws(const wchar_t *ws, FILE *stream) if (drop_reference_if_disabled(entry)) goto do_real_fn; - entry->fd_err = ENOTSUP; - + DISABLE_STREAM(entry, stream); vector_decref(&fd_table, entry); - errno = ENOTSUP; - return -1; - do_real_fn: return __real_fputws(ws, stream); } diff --git a/src/engine/server_iv.c b/src/engine/server_iv.c index 8349d7bee01..a5275cc2e7f 100644 --- a/src/engine/server_iv.c +++ b/src/engine/server_iv.c @@ -578,7 +578,7 @@ ivc_on_get(crt_iv_namespace_t ivns, crt_iv_key_t *iv_key, struct ds_iv_class *class; struct ds_iv_key key; struct iv_priv_entry *priv_entry; - void *entry_priv_val; + void *entry_priv_val = NULL; bool alloc_entry = false; int rc; @@ -978,7 +978,7 @@ ds_iv_done(crt_iv_namespace_t ivns, uint32_t class_id, iv_value->sg_iovs[0].iov_len); } - ABT_future_set(cb_info->future, &rc); + ABT_future_set(cb_info->future, NULL); return ret; } diff --git a/src/object/tests/srv_checksum_tests.c b/src/object/tests/srv_checksum_tests.c index 97c9d19fa26..dd6f1cb3e54 100644 --- a/src/object/tests/srv_checksum_tests.c +++ b/src/object/tests/srv_checksum_tests.c @@ -1275,7 +1275,7 @@ fetch_with_hole7(void **state) .layout = { {.data = "ABCDEFGHIJKLM", .sel = {1, 2}, .ful = {1, 13} }, {.data = "", .sel = {3, 7}, .ful = {3, 7}, .is_hole = true}, - {.data = "HIJKLM", .sel = {8, 13}, .ful = {1, 13} }, + {.data = "HIJKLM", .sel = {8, 13}, .ful = {8, 13} }, {.data = NULL} } }); diff --git a/src/pool/srv_iv.c b/src/pool/srv_iv.c index 99c5cad9127..7e72d30f66e 100644 --- a/src/pool/srv_iv.c +++ b/src/pool/srv_iv.c @@ -1222,8 +1222,7 @@ pool_iv_update(struct ds_iv_ns *ns, int class_id, uuid_t key_uuid, } int -ds_pool_iv_map_update(struct ds_pool *pool, struct pool_buf *buf, - uint32_t map_ver) +ds_pool_iv_map_update(struct ds_pool *pool, struct pool_buf *buf, uint32_t map_ver) { struct pool_iv_entry *iv_entry; uint32_t iv_entry_size; @@ -1240,8 +1239,7 @@ ds_pool_iv_map_update(struct ds_pool *pool, struct pool_buf *buf, return -DER_NOMEM; crt_group_rank(pool->sp_group, &iv_entry->piv_map.piv_master_rank); - iv_entry->piv_map.piv_pool_map_ver = - buf == NULL ? 0 : pool->sp_map_version; + iv_entry->piv_map.piv_pool_map_ver = buf == NULL ? 0 : map_ver; if (buf != NULL) memcpy(&iv_entry->piv_map.piv_pool_buf, buf, pool_buf_size(buf->pb_nr)); diff --git a/src/rsvc/srv.c b/src/rsvc/srv.c index e1b438a2a5d..7d47aa8931f 100644 --- a/src/rsvc/srv.c +++ b/src/rsvc/srv.c @@ -1200,7 +1200,7 @@ bcast_create(crt_opcode_t opc, bool filter_invert, d_rank_list_t *filter_ranks, NULL /* co_bulk_hdl */, NULL /* priv */, filter_invert ? CRT_RPC_FLAG_FILTER_INVERT : 0, - crt_tree_topo(CRT_TREE_FLAT, 0), rpc); + crt_tree_topo(CRT_TREE_KNOMIAL, 2), rpc); } /** diff --git a/src/tests/ftest/util/launch_utils.py b/src/tests/ftest/util/launch_utils.py index 2ed42ce7a9b..a86df01ea55 100644 --- a/src/tests/ftest/util/launch_utils.py +++ b/src/tests/ftest/util/launch_utils.py @@ -1015,8 +1015,8 @@ def update_test_yaml(self, logger, scm_size, scm_mount, extra_yaml, multiplier, if new_yaml_file: if verbose > 0: # Optionally display a diff of the yaml file - if not run_local(logger, f"diff -y {test.yaml_file} {new_yaml_file}").passed: - raise RunException(f"Error diff'ing {test.yaml_file}") + # diff returns rc=1 if the files are different, so ignore errors + run_local(logger, f"diff -y {test.yaml_file} {new_yaml_file}") test.yaml_file = new_yaml_file # Display the modified yaml file variants with debug diff --git a/src/tests/suite/daos_extend_simple.c b/src/tests/suite/daos_extend_simple.c index 117ea095566..98be6290844 100644 --- a/src/tests/suite/daos_extend_simple.c +++ b/src/tests/suite/daos_extend_simple.c @@ -33,6 +33,8 @@ extend_dkeys(void **state) int j; int rc; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 3)) return; @@ -73,6 +75,8 @@ extend_akeys(void **state) int j; int rc; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 3)) return; @@ -113,6 +117,8 @@ extend_indexes(void **state) int k; int rc; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 3)) return; @@ -155,6 +161,8 @@ extend_large_rec(void **state) int j; int rc; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 3)) return; @@ -192,6 +200,8 @@ extend_objects(void **state) daos_obj_id_t oids[OBJ_NR]; int i; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 3)) return; @@ -250,6 +260,8 @@ extend_read_check(dfs_t *dfs_mt, dfs_obj_t *dir) buf = malloc(buf_size); verify_buf = malloc(buf_size); + print_message("%s(): allocations buf_size=" DF_U64 ", buf=%p, verify_buf=%p\n", + __FUNCTION__, buf_size, buf, verify_buf); assert_non_null(buf); assert_non_null(verify_buf); d_iov_set(&iov, buf, buf_size); @@ -266,18 +278,23 @@ extend_read_check(dfs_t *dfs_mt, dfs_obj_t *dir) sprintf(filename, "file%d", i); rc = dfs_open(dfs_mt, dir, filename, S_IFREG | S_IWUSR | S_IRUSR, O_RDWR, OC_EC_2P1GX, 1048576, NULL, &obj); + print_message("%s(): dfs_open(filename=%s) rc=%d\n", __FUNCTION__, filename, rc); assert_int_equal(rc, 0); memset(verify_buf, 'a' + i, buf_size); rc = dfs_read(dfs_mt, obj, &sgl, 0, &read_size, NULL); + print_message("%s(): dfs_read() read_size=" DF_U64 ", rc=%d\n", __FUNCTION__, + read_size, rc); assert_int_equal(rc, 0); assert_int_equal((int)read_size, buf_size); assert_memory_equal(buf, verify_buf, read_size); rc = dfs_release(obj); + print_message("%s(): dfs_release() rc=%d\n", __FUNCTION__, rc); assert_int_equal(rc, 0); } free(buf); free(verify_buf); + print_message("%s(): done, freed buf and verify_buf\n", __FUNCTION__); } static void @@ -509,6 +526,7 @@ dfs_extend_punch_kill(void **state) { FAULT_INJECTION_REQUIRED(); + print_message("BEGIN %s\n", __FUNCTION__); dfs_extend_internal(state, EXTEND_PUNCH, extend_cb_internal, true); } @@ -517,6 +535,7 @@ dfs_extend_punch_extend(void **state) { FAULT_INJECTION_REQUIRED(); + print_message("BEGIN %s\n", __FUNCTION__); dfs_extend_internal(state, EXTEND_PUNCH, extend_cb_internal, false); } @@ -525,6 +544,7 @@ dfs_extend_stat_kill(void **state) { FAULT_INJECTION_REQUIRED(); + print_message("BEGIN %s\n", __FUNCTION__); dfs_extend_internal(state, EXTEND_STAT, extend_cb_internal, true); } @@ -533,6 +553,7 @@ dfs_extend_stat_extend(void **state) { FAULT_INJECTION_REQUIRED(); + print_message("BEGIN %s\n", __FUNCTION__); dfs_extend_internal(state, EXTEND_STAT, extend_cb_internal, false); } @@ -541,6 +562,7 @@ dfs_extend_enumerate_kill(void **state) { FAULT_INJECTION_REQUIRED(); + print_message("BEGIN %s\n", __FUNCTION__); dfs_extend_internal(state, EXTEND_ENUMERATE, extend_cb_internal, true); } @@ -549,6 +571,7 @@ dfs_extend_enumerate_extend(void **state) { FAULT_INJECTION_REQUIRED(); + print_message("BEGIN %s\n", __FUNCTION__); dfs_extend_internal(state, EXTEND_ENUMERATE, extend_cb_internal, false); } @@ -557,6 +580,7 @@ dfs_extend_fetch_kill(void **state) { FAULT_INJECTION_REQUIRED(); + print_message("BEGIN %s\n", __FUNCTION__); dfs_extend_internal(state, EXTEND_FETCH, extend_cb_internal, true); } @@ -565,6 +589,7 @@ dfs_extend_fetch_extend(void **state) { FAULT_INJECTION_REQUIRED(); + print_message("BEGIN %s\n", __FUNCTION__); dfs_extend_internal(state, EXTEND_FETCH, extend_cb_internal, false); } @@ -573,6 +598,7 @@ dfs_extend_write_kill(void **state) { FAULT_INJECTION_REQUIRED(); + print_message("BEGIN %s\n", __FUNCTION__); dfs_extend_internal(state, EXTEND_UPDATE, extend_cb_internal, true); } @@ -581,6 +607,7 @@ dfs_extend_write_extend(void **state) { FAULT_INJECTION_REQUIRED(); + print_message("BEGIN %s\n", __FUNCTION__); dfs_extend_internal(state, EXTEND_UPDATE, extend_cb_internal, false); } @@ -598,6 +625,8 @@ dfs_extend_fail_retry(void **state) FAULT_INJECTION_REQUIRED(); + print_message("BEGIN %s\n", __FUNCTION__); + attr.da_props = daos_prop_alloc(1); assert_non_null(attr.da_props); attr.da_props->dpp_entries[0].dpe_type = DAOS_PROP_CO_REDUN_LVL; diff --git a/src/tests/suite/daos_rebuild_ec.c b/src/tests/suite/daos_rebuild_ec.c index 77df81730bd..492ec652624 100644 --- a/src/tests/suite/daos_rebuild_ec.c +++ b/src/tests/suite/daos_rebuild_ec.c @@ -112,6 +112,8 @@ rebuild_mixed_stripes(void **state) d_rank_t rank = 0; int size = 8 * CELL_SIZE + 10000; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 7)) return; @@ -173,6 +175,8 @@ rebuild_ec_multi_stripes(void **state) uint16_t fail_shards[2]; int i, size = 8 * CELL_SIZE; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 7)) return; @@ -314,78 +318,92 @@ rebuild_ec_6nodes_setup(void **state) static void rebuild_partial_fail_data(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_2P1G1, 1, 0, PARTIAL_UPDATE); + print_message("END %s\n", __FUNCTION__); } static void rebuild_partial_fail_parity(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_2P1G1, 0, 1, PARTIAL_UPDATE); } static void rebuild_full_fail_data(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_2P1G1, 1, 0, FULL_UPDATE); } static void rebuild_full_fail_parity(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_2P1G1, 0, 1, FULL_UPDATE); } static void rebuild_full_partial_fail_data(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_2P1G1, 1, 0, FULL_PARTIAL_UPDATE); } static void rebuild_full_partial_fail_parity(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_2P1G1, 0, 1, FULL_PARTIAL_UPDATE); } static void rebuild_partial_full_fail_data(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_2P1G1, 1, 0, PARTIAL_FULL_UPDATE); } static void rebuild_partial_full_fail_parity(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_2P1G1, 0, 1, PARTIAL_FULL_UPDATE); } static void rebuild2p_partial_fail_data(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_4P2G1, 1, 0, FULL_UPDATE); } static void rebuild2p_partial_fail_2data(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_4P2G1, 2, 0, FULL_UPDATE); } static void rebuild2p_partial_fail_data_parity(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_4P2G1, 1, 1, FULL_UPDATE); } static void rebuild2p_partial_fail_parity(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_4P2G1, 0, 1, FULL_UPDATE); } static void rebuild2p_partial_fail_2parity(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_internal(state, OC_EC_4P2G1, 0, 2, FULL_UPDATE); } @@ -394,6 +412,7 @@ rebuild_dfs_fail_data_s0(void **state) { int shard = 0; + print_message("BEGIN %s\n", __FUNCTION__); dfs_ec_rebuild_io(state, &shard, 1); } @@ -402,6 +421,7 @@ rebuild_dfs_fail_data_s1(void **state) { int shard = 1; + print_message("BEGIN %s\n", __FUNCTION__); dfs_ec_rebuild_io(state, &shard, 1); } @@ -410,6 +430,7 @@ rebuild_dfs_fail_data_s3(void **state) { int shard = 3; + print_message("BEGIN %s\n", __FUNCTION__); dfs_ec_rebuild_io(state, &shard, 1); } @@ -418,6 +439,7 @@ rebuild_dfs_fail_2data_s0s1(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 0; shards[1] = 1; dfs_ec_rebuild_io(state, shards, 2); @@ -428,6 +450,7 @@ rebuild_dfs_fail_2data_s0s2(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 0; shards[1] = 2; dfs_ec_rebuild_io(state, shards, 2); @@ -438,6 +461,7 @@ rebuild_dfs_fail_2data_s0s3(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 0; shards[1] = 3; dfs_ec_rebuild_io(state, shards, 2); @@ -448,6 +472,7 @@ rebuild_dfs_fail_2data_s1s2(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 1; shards[1] = 2; dfs_ec_rebuild_io(state, shards, 2); @@ -458,6 +483,7 @@ rebuild_dfs_fail_2data_s1s3(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 1; shards[1] = 3; dfs_ec_rebuild_io(state, shards, 2); @@ -468,6 +494,7 @@ rebuild_dfs_fail_2data_s2s3(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 2; shards[1] = 3; dfs_ec_rebuild_io(state, shards, 2); @@ -478,6 +505,7 @@ rebuild_dfs_fail_data_parity_s0p1(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 0; shards[1] = 5; dfs_ec_rebuild_io(state, shards, 2); @@ -488,6 +516,7 @@ rebuild_dfs_fail_data_parity_s3p1(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 3; shards[1] = 5; dfs_ec_rebuild_io(state, shards, 2); @@ -498,6 +527,7 @@ rebuild_dfs_fail_data_parity_s2p1(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 2; shards[1] = 5; dfs_ec_rebuild_io(state, shards, 2); @@ -508,6 +538,7 @@ rebuild_dfs_fail_data_parity_s0p0(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 0; shards[1] = 4; dfs_ec_rebuild_io(state, shards, 2); @@ -518,6 +549,7 @@ rebuild_dfs_fail_data_parity_s2p0(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 2; shards[1] = 4; dfs_ec_rebuild_io(state, shards, 2); @@ -528,6 +560,7 @@ rebuild_dfs_fail_data_parity_s3p0(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 3; shards[1] = 4; dfs_ec_rebuild_io(state, shards, 2); @@ -681,6 +714,7 @@ rebuild_dfs_fail_seq_s0s1(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 0; shards[1] = 1; dfs_ec_seq_fail(state, shards, 2); @@ -691,6 +725,7 @@ rebuild_dfs_fail_seq_s1s2(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 1; shards[1] = 2; dfs_ec_seq_fail(state, shards, 2); @@ -701,6 +736,7 @@ rebuild_dfs_fail_seq_s2s3(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 2; shards[1] = 3; dfs_ec_seq_fail(state, shards, 2); @@ -711,6 +747,7 @@ rebuild_dfs_fail_seq_s0s3(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 0; shards[1] = 3; dfs_ec_seq_fail(state, shards, 2); @@ -721,6 +758,7 @@ rebuild_dfs_fail_seq_s0p0(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 0; shards[1] = 4; dfs_ec_seq_fail(state, shards, 2); @@ -731,6 +769,7 @@ rebuild_dfs_fail_seq_s3p1(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 3; shards[1] = 5; dfs_ec_seq_fail(state, shards, 2); @@ -741,6 +780,7 @@ rebuild_dfs_fail_seq_p0p1(void **state) { int shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); shards[0] = 4; shards[1] = 5; dfs_ec_seq_fail(state, shards, 2); @@ -765,6 +805,8 @@ rebuild_multiple_group_ec_object(void **state) int size = 4 * CELL_SIZE; int rc; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 8)) return; @@ -874,6 +916,8 @@ rebuild_ec_dkey_enumeration(void **state) d_rank_t rank; int i; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 8)) return; @@ -905,6 +949,8 @@ rebuild_ec_parity_multi_group(void **state) d_rank_t rank; int i; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 8)) return; @@ -993,12 +1039,14 @@ rebuild_ec_snapshot(void **state, daos_oclass_id_t oclass, int shard) static void rebuild_ec_snapshot_data_shard(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_snapshot(state, OC_EC_4P2G1, 0); } static void rebuild_ec_snapshot_parity_shard(void **state) { + print_message("BEGIN %s\n", __FUNCTION__); rebuild_ec_snapshot(state, OC_EC_4P2G1, 5); } @@ -1014,6 +1062,8 @@ rebuild_ec_parity_overwrite(void **state) int i; int stripe_size = 2 * CELL_SIZE; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 8)) return; @@ -1058,6 +1108,8 @@ rebuild_ec_then_aggregation(void **state) char *data; char *verify_data; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 8)) return; @@ -1115,6 +1167,8 @@ rebuild_ec_multiple_shards(void **state) uint64_t stripe_size = 4 * CELL_SIZE; daos_recx_t recx; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 6)) return; @@ -1198,6 +1252,8 @@ rebuild_ec_multiple_failure_tgts(void **state) char data[20]; char v_data[20]; + print_message("BEGIN %s\n", __FUNCTION__); + if (!test_runable(arg, 6)) return; @@ -1340,6 +1396,7 @@ rebuild_ec_overwrite_fail_parity_data(void **state) { int kill_shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); kill_shards[0] = 0; kill_shards[1] = 1; rebuild_ec_parity_overwrite_fail_parity_internal(state, kill_shards, 2, false); @@ -1350,6 +1407,7 @@ rebuild_ec_overwrite_fail_parity_data_with_parity(void **state) { int kill_shards[2]; + print_message("BEGIN %s\n", __FUNCTION__); kill_shards[0] = 1; kill_shards[1] = 2; rebuild_ec_parity_overwrite_fail_parity_internal(state, kill_shards, 2, true); @@ -1363,6 +1421,7 @@ rebuild_ec_combined_ops(void **state) daos_obj_id_t oid; int rc; + print_message("BEGIN %s\n", __FUNCTION__); if (!test_runable(arg, 6)) return; @@ -1394,6 +1453,7 @@ rebuild_ec_combined_ops(void **state) ioreq_init(&req, arg->coh, oid, DAOS_IOD_ARRAY, arg); verify_ec_full(&req, arg->index, 0); ioreq_fini(&req); + print_message("END %s\n", __FUNCTION__); } /** create a new pool/container for each test */ diff --git a/src/tests/suite/dfuse_test.c b/src/tests/suite/dfuse_test.c index acf46e6b7e4..eea40621108 100644 --- a/src/tests/suite/dfuse_test.c +++ b/src/tests/suite/dfuse_test.c @@ -324,9 +324,17 @@ do_stream(void **state) rc = fclose(stream); assert_int_equal(rc, 0); - rc = unlinkat(root, "stream_file", 0); + fd = openat(root, "stream_file", O_RDWR | O_EXCL, S_IWUSR | S_IRUSR); + assert_return_code(fd, errno); + stream = fdopen(fd, "w+"); + assert_non_null(stream); + + rc = fputs("Hello World!\n", stream); assert_return_code(rc, errno); + fclose(stream); + rc = unlinkat(root, "stream_file", 0); + assert_return_code(rc, errno); rc = close(root); assert_return_code(rc, errno); } diff --git a/src/utils/ddb/tests/ddb_vos_tests.c b/src/utils/ddb/tests/ddb_vos_tests.c index d398303ae98..f0c73a4f367 100644 --- a/src/utils/ddb/tests/ddb_vos_tests.c +++ b/src/utils/ddb/tests/ddb_vos_tests.c @@ -295,7 +295,7 @@ get_dkey_from_idx_tests(void **state) assert_success(dv_get_dkey(coh, uoid, 0, &dkey)); i = 1; while (SUCCESS(dv_get_dkey(coh, uoid, i, &dkey2))) { - assert_string_not_equal(dkey.iov_buf, dkey2.iov_buf); + assert_key_not_equal(dkey, dkey2); i++; daos_iov_free(&dkey2); } @@ -330,8 +330,8 @@ get_akey_from_idx_tests(void **state) assert_success(dv_get_akey(coh, uoid, &dkey, 0, &akey)); i = 1; - while (SUCCESS(dv_get_dkey(coh, uoid, i, &akey2))) { - assert_string_not_equal(akey.iov_buf, akey2.iov_buf); + while (SUCCESS(dv_get_akey(coh, uoid, &dkey, i, &akey2))) { + assert_key_not_equal(akey, akey2); i++; daos_iov_free(&akey2); } diff --git a/src/vos/tests/evt_ctl.c b/src/vos/tests/evt_ctl.c index 138f06d7e23..12bfb27a21b 100644 --- a/src/vos/tests/evt_ctl.c +++ b/src/vos/tests/evt_ctl.c @@ -1770,7 +1770,7 @@ insert_val(struct test_arg *arg, daos_handle_t toh, daos_epoch_t epoch, uint64_t memset(&entry.ei_csum, 0, sizeof(entry.ei_csum)); - rc = bio_alloc_init(arg->ta_utx, &entry.ei_addr, &data, length); + rc = bio_alloc_init(arg->ta_utx, &entry.ei_addr, data, length); if (rc != 0) return rc; diff --git a/src/vos/tests/vts_pm.c b/src/vos/tests/vts_pm.c index 07da1dba3ee..99e53fc71b6 100644 --- a/src/vos/tests/vts_pm.c +++ b/src/vos/tests/vts_pm.c @@ -1968,7 +1968,7 @@ many_keys(void **state) assert_rc_equal(rc, 0); rex.rx_idx = 0; - rex.rx_nr = sizeof(w) - 1; + rex.rx_nr = strlen(w); iod.iod_type = DAOS_IOD_ARRAY; iod.iod_size = 1;