Skip to content

DAOS-19495 object: fix segfault on max epoch query in a transaction (… #18890

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

Open
mchaarawi wants to merge 1 commit into
base: release/2.8
Choose a base branch
from
+106 −91
Open

DAOS-19495 object: fix segfault on max epoch query in a transaction (… #18890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions src/object/obj_tx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* (C) Copyright 2020-2024 Intel Corporation.
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
* (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -3548,7 +3548,11 @@ dc_tx_attach(daos_handle_t th, struct dc_object *obj, enum obj_rpc_opc opc, tse_
daos_key_t *dkey;
uint32_t nr;

if (qu->flags & DAOS_GET_DKEY) {
if (qu->flags == 0) {
/* Query max epoch only, neither dkey nor akey is given. */
dkey = NULL;
nr = 0;
} else if (qu->flags & DAOS_GET_DKEY) {
dkey = NULL;
nr = 0;
} else if (qu->flags & DAOS_GET_AKEY) {
Expand Down
189 changes: 100 additions & 89 deletions src/tests/suite/daos_dist_tx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* (C) Copyright 2020-2022 Intel Corporation.
* (C) Copyright 2026 Hewlett Packard Enterprise Development LP
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -3047,6 +3048,55 @@ dtx_41(void **state)
dtx_uncertainty_miss_request(*state, DAOS_DTX_MISS_ABORT, true, true);
}

static void
dtx_42(void **state)
{
test_arg_t *arg = *state;
const char *dkey = dts_dtx_dkey;
const char *akey = dts_dtx_akey;
char write_buf[DTX_IO_SMALL];
char fetch_buf[DTX_IO_SMALL];
daos_handle_t th = {0};
daos_obj_id_t oid;
struct ioreq req;
daos_epoch_t epoch = 0;
int i;

print_message("DTX42: query max epoch in transaction\n");

par_barrier(PAR_COMM_WORLD);

arg->async = 0;
oid = daos_test_oid_gen(arg->coh, OC_RP_XSF, 0, 0, arg->myrank);
ioreq_init(&req, arg->coh, oid, DAOS_IOD_SINGLE, arg);

dts_buf_render(write_buf, DTX_IO_SMALL);
insert_single(dkey, akey, 0, write_buf, DTX_IO_SMALL, DAOS_TX_NONE, &req);

MUST(daos_tx_open(arg->coh, &th, 0, NULL));

/* Object level read: neither dkey nor akey is involved. */
MUST(daos_obj_query_max_epoch(req.oh, th, &epoch, NULL));
assert_int_not_equal(epoch, 0);

/* Reuse 'write_buf' with different data. */
for (i = 0; i < DTX_IO_SMALL; i++)
write_buf[i] += 1;

/* Modification to make the commit generate a CPD RPC carrying the cached read above. */
insert_single(dkey, akey, 0, write_buf, DTX_IO_SMALL, th, &req);

MUST(daos_tx_commit(th, NULL));

lookup_single(dkey, akey, 0, fetch_buf, DTX_IO_SMALL, DAOS_TX_NONE, &req);
assert_memory_equal(write_buf, fetch_buf, DTX_IO_SMALL);

ioreq_fini(&req);
MUST(daos_tx_close(th, NULL));

par_barrier(PAR_COMM_WORLD);
}

static test_arg_t *saved_dtx_arg;

static int
Expand Down Expand Up @@ -3104,95 +3154,56 @@ dtx_sub_teardown(void **state)
}

static const struct CMUnitTest dtx_tests[] = {
{"DTX0: SV fetch against EC obj",
dtx_0, NULL, test_case_teardown},
{"DTX1: multiple SV update against the same obj",
dtx_1, NULL, test_case_teardown},
{"DTX2: multiple EV update against the same obj",
dtx_2, NULL, test_case_teardown},
{"DTX3: Multiple small SV update against multiple objs",
dtx_3, NULL, test_case_teardown},
{"DTX4: Multiple large EV update against multiple objs",
dtx_4, NULL, test_case_teardown},
{"DTX5: Multiple small SV update on multiple EC objs",
dtx_5, NULL, test_case_teardown},
{"DTX6: Multiple large EV update on multiple EC objs",
dtx_6, NULL, test_case_teardown},
{"DTX7: SV update plus punch",
dtx_7, NULL, test_case_teardown},
{"DTX8: EV update plus punch",
dtx_8, NULL, test_case_teardown},
{"DTX9: conditional insert/update",
dtx_9, NULL, test_case_teardown},
{"DTX10: conditional punch",
dtx_10, NULL, test_case_teardown},
{"DTX11: read only transaction",
dtx_11, NULL, test_case_teardown},
{"DTX12: zero copy flag",
dtx_12, NULL, test_case_teardown},
{"DTX13: DTX status machnie",
dtx_13, NULL, test_case_teardown},
{"DTX14: restart because of conflict with others",
dtx_14, NULL, test_case_teardown},
{"DTX15: restart because of stale pool map",
dtx_15, NULL, test_case_teardown},
{"DTX16: resend commit because of lost CPD request",
dtx_16, NULL, test_case_teardown},
{"DTX17: resend commit because of lost CPD reply",
dtx_17, NULL, test_case_teardown},
{"DTX18: spread read time-stamp when commit",
dtx_18, NULL, test_case_teardown},
{"DTX19: Misc rep and EC object update in same TX",
dtx_19, NULL, test_case_teardown},

{"DTX20: atomicity - either all done or none done",
dtx_20, NULL, test_case_teardown},
{"DTX21: atomicity - internal transaction",
dtx_21, NULL, test_case_teardown},
{"DTX22: TX isolation - invisible partial modification",
dtx_22, NULL, test_case_teardown},
{"DTX23: server start epoch - refuse TX with old epoch",
dtx_23, NULL, test_case_teardown},
{"DTX24: async batched commit",
dtx_24, NULL, test_case_teardown},

{"DTX25: uncertain status check - committable",
dtx_25, NULL, test_case_teardown},
{"DTX26: uncertain status check - non-committable",
dtx_26, NULL, test_case_teardown},
{"DTX27: uncertain status check - miss commit",
dtx_27, NULL, test_case_teardown},
{"DTX28: uncertain status check - miss abort",
dtx_28, NULL, test_case_teardown},

{"DTX29: uncertain status check - fetch re-entry",
dtx_29, NULL, test_case_teardown},
{"DTX30: uncertain status check - enumeration re-entry",
dtx_30, NULL, test_case_teardown},
{"DTX31: uncertain status check - punch re-entry",
dtx_31, NULL, test_case_teardown},
{"DTX32: uncertain status check - update re-entry",
dtx_32, NULL, test_case_teardown},
{"DTX33: uncertain status check - query key re-entry",
dtx_33, NULL, test_case_teardown},
{"DTX34: uncertain status check - CPD RPC re-entry",
dtx_34, NULL, test_case_teardown},

{"DTX35: resync during reopen container",
dtx_35, NULL, test_case_teardown},
{"DTX36: resync - DTX entry for read only ops",
dtx_36, dtx_sub_setup, dtx_sub_teardown},
{"DTX37: resync - leader failed during prepare",
dtx_37, dtx_sub_setup, dtx_sub_teardown},
{"DTX38: resync - lost whole redundancy groups",
dtx_38, dtx_sub_rf0_setup, dtx_sub_teardown},
{"DTX39: not restart the transaction with fixed epoch",
dtx_39, dtx_sub_rf1_setup, dtx_sub_teardown},

{"DTX40: uncertain check - miss commit with delay",
dtx_40, NULL, test_case_teardown},
{"DTX41: uncertain check - miss abort with delay",
dtx_41, NULL, test_case_teardown},
{"DTX0: SV fetch against EC obj", dtx_0, NULL, test_case_teardown},
{"DTX1: multiple SV update against the same obj", dtx_1, NULL, test_case_teardown},
{"DTX2: multiple EV update against the same obj", dtx_2, NULL, test_case_teardown},
{"DTX3: Multiple small SV update against multiple objs", dtx_3, NULL, test_case_teardown},
{"DTX4: Multiple large EV update against multiple objs", dtx_4, NULL, test_case_teardown},
{"DTX5: Multiple small SV update on multiple EC objs", dtx_5, NULL, test_case_teardown},
{"DTX6: Multiple large EV update on multiple EC objs", dtx_6, NULL, test_case_teardown},
{"DTX7: SV update plus punch", dtx_7, NULL, test_case_teardown},
{"DTX8: EV update plus punch", dtx_8, NULL, test_case_teardown},
{"DTX9: conditional insert/update", dtx_9, NULL, test_case_teardown},
{"DTX10: conditional punch", dtx_10, NULL, test_case_teardown},
{"DTX11: read only transaction", dtx_11, NULL, test_case_teardown},
{"DTX12: zero copy flag", dtx_12, NULL, test_case_teardown},
{"DTX13: DTX status machnie", dtx_13, NULL, test_case_teardown},
{"DTX14: restart because of conflict with others", dtx_14, NULL, test_case_teardown},
{"DTX15: restart because of stale pool map", dtx_15, NULL, test_case_teardown},
{"DTX16: resend commit because of lost CPD request", dtx_16, NULL, test_case_teardown},
{"DTX17: resend commit because of lost CPD reply", dtx_17, NULL, test_case_teardown},
{"DTX18: spread read time-stamp when commit", dtx_18, NULL, test_case_teardown},
{"DTX19: Misc rep and EC object update in same TX", dtx_19, NULL, test_case_teardown},

{"DTX20: atomicity - either all done or none done", dtx_20, NULL, test_case_teardown},
{"DTX21: atomicity - internal transaction", dtx_21, NULL, test_case_teardown},
{"DTX22: TX isolation - invisible partial modification", dtx_22, NULL, test_case_teardown},
{"DTX23: server start epoch - refuse TX with old epoch", dtx_23, NULL, test_case_teardown},
{"DTX24: async batched commit", dtx_24, NULL, test_case_teardown},

{"DTX25: uncertain status check - committable", dtx_25, NULL, test_case_teardown},
{"DTX26: uncertain status check - non-committable", dtx_26, NULL, test_case_teardown},
{"DTX27: uncertain status check - miss commit", dtx_27, NULL, test_case_teardown},
{"DTX28: uncertain status check - miss abort", dtx_28, NULL, test_case_teardown},

{"DTX29: uncertain status check - fetch re-entry", dtx_29, NULL, test_case_teardown},
{"DTX30: uncertain status check - enumeration re-entry", dtx_30, NULL, test_case_teardown},
{"DTX31: uncertain status check - punch re-entry", dtx_31, NULL, test_case_teardown},
{"DTX32: uncertain status check - update re-entry", dtx_32, NULL, test_case_teardown},
{"DTX33: uncertain status check - query key re-entry", dtx_33, NULL, test_case_teardown},
{"DTX34: uncertain status check - CPD RPC re-entry", dtx_34, NULL, test_case_teardown},

{"DTX35: resync during reopen container", dtx_35, NULL, test_case_teardown},
{"DTX36: resync - DTX entry for read only ops", dtx_36, dtx_sub_setup, dtx_sub_teardown},
{"DTX37: resync - leader failed during prepare", dtx_37, dtx_sub_setup, dtx_sub_teardown},
{"DTX38: resync - lost whole redundancy groups", dtx_38, dtx_sub_rf0_setup, dtx_sub_teardown},
{"DTX39: not restart the transaction with fixed epoch", dtx_39, dtx_sub_rf1_setup,
dtx_sub_teardown},

{"DTX40: uncertain check - miss commit with delay", dtx_40, NULL, test_case_teardown},
{"DTX41: uncertain check - miss abort with delay", dtx_41, NULL, test_case_teardown},

{"DTX42: query max epoch in transaction", dtx_42, NULL, test_case_teardown},
};

static int
Expand Down
Loading