Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
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
6 changes: 3 additions & 3 deletions src/include/daos_srv/vos.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* (C) Copyright 2015-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 @@ -913,8 +913,8 @@ vos_obj_mark_corruption(daos_handle_t coh, daos_epoch_t epoch, uint32_t pm_ver,
* \param[in] nr Number of I/O descriptors in \a ios.
* \param[in,out] iods Array of I/O descriptors. The returned record sizes are also restored in
* this parameter.
* \param[in] vos_flags VOS fetch flags, VOS cond flags, VOS_OF_FETCH_SIZE_ONLY or
* VOS_OF_FETCH_RECX_LIST.
* \param[in] vos_flags VOS fetch flags, VOS cond flags, VOS_OF_FETCH_SIZE_ONLY,
* VOS_OF_FETCH_RECX_LIST or VOS_OF_FETCH_CSUM.
* \param[in] shadows Optional shadow recx/epoch lists, one for each iod.
* data of extents covered by these should not be returned
* by fetch function. Only used for EC obj degraded fetch.
Expand Down
44 changes: 23 additions & 21 deletions src/include/daos_srv/vos_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -260,49 +260,51 @@ typedef enum {

enum {
/** Conditional Op: Punch key if it exists, fail otherwise */
VOS_OF_COND_PUNCH = DAOS_COND_PUNCH,
VOS_OF_COND_PUNCH = DAOS_COND_PUNCH,
/** Conditional Op: Insert dkey if it doesn't exist, fail otherwise */
VOS_OF_COND_DKEY_INSERT = DAOS_COND_DKEY_INSERT,
VOS_OF_COND_DKEY_INSERT = DAOS_COND_DKEY_INSERT,
/** Conditional Op: Update dkey if it exists, fail otherwise */
VOS_OF_COND_DKEY_UPDATE = DAOS_COND_DKEY_UPDATE,
VOS_OF_COND_DKEY_UPDATE = DAOS_COND_DKEY_UPDATE,
/** Conditional Op: Fetch dkey if it exists, fail otherwise */
VOS_OF_COND_DKEY_FETCH = DAOS_COND_DKEY_FETCH,
VOS_OF_COND_DKEY_FETCH = DAOS_COND_DKEY_FETCH,
/** Conditional Op: Insert akey if it doesn't exist, fail otherwise */
VOS_OF_COND_AKEY_INSERT = DAOS_COND_AKEY_INSERT,
VOS_OF_COND_AKEY_INSERT = DAOS_COND_AKEY_INSERT,
/** Conditional Op: Update akey if it exists, fail otherwise */
VOS_OF_COND_AKEY_UPDATE = DAOS_COND_AKEY_UPDATE,
VOS_OF_COND_AKEY_UPDATE = DAOS_COND_AKEY_UPDATE,
/** Conditional Op: Fetch akey if it exists, fail otherwise */
VOS_OF_COND_AKEY_FETCH = DAOS_COND_AKEY_FETCH,
VOS_OF_COND_AKEY_FETCH = DAOS_COND_AKEY_FETCH,
/** Indicates akey conditions are specified in iod_flags */
VOS_OF_COND_PER_AKEY = DAOS_COND_PER_AKEY,
VOS_OF_COND_PER_AKEY = DAOS_COND_PER_AKEY,
/* critical update - skip checks on SCM system/held space */
VOS_OF_CRIT = (1 << 8),
VOS_OF_CRIT = (1 << 8),
/** Instead of update or punch of extents, remove all extents
* under the specified range. Intended for internal use only.
*/
VOS_OF_REMOVE = (1 << 9),
VOS_OF_REMOVE = (1 << 9),
/* only query iod_size */
VOS_OF_FETCH_SIZE_ONLY = (1 << 10),
VOS_OF_FETCH_SIZE_ONLY = (1 << 10),
/* query recx list */
VOS_OF_FETCH_RECX_LIST = (1 << 11),
VOS_OF_FETCH_RECX_LIST = (1 << 11),
/* only set read TS */
VOS_OF_FETCH_SET_TS_ONLY = (1 << 12),
VOS_OF_FETCH_SET_TS_ONLY = (1 << 12),
/* check the target (obj/dkey/akey) existence */
VOS_OF_FETCH_CHECK_EXISTENCE = (1 << 13),
VOS_OF_FETCH_CHECK_EXISTENCE = (1 << 13),
/** Set when propagating a punch that results in empty subtree */
VOS_OF_PUNCH_PROPAGATE = (1 << 14),
VOS_OF_PUNCH_PROPAGATE = (1 << 14),
/** replay punch (underwrite) */
VOS_OF_REPLAY_PC = (1 << 15),
VOS_OF_REPLAY_PC = (1 << 15),
/** Dedup update mode */
VOS_OF_DEDUP = (1 << 16),
VOS_OF_DEDUP = (1 << 16),
/** Dedup update with memcmp verify mode */
VOS_OF_DEDUP_VERIFY = (1 << 17),
VOS_OF_DEDUP_VERIFY = (1 << 17),
/** Ignore fetch only used by shadow fetch to ignore the evt fetch */
VOS_OF_SKIP_FETCH = (1 << 18),
VOS_OF_SKIP_FETCH = (1 << 18),
/** Operation on EC object (currently only applies to update) */
VOS_OF_EC = (1 << 19),
VOS_OF_EC = (1 << 19),
/** Update from rebuild */
VOS_OF_REBUILD = (1 << 20),
VOS_OF_REBUILD = (1 << 20),
/* only query for checksums */
VOS_OF_FETCH_CSUM = (1 << 21),
};

enum {
Expand Down
6 changes: 3 additions & 3 deletions src/vos/tests/vos_tests.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* (C) Copyright 2016-2023 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 @@ -166,7 +166,7 @@ main(int argc, char **argv)
#if CMOCKA_FILTER_SUPPORTED == 1 /** requires cmocka 1.1.5 */
cmocka_set_skip_filter(optarg);
#else
D_PRINT("filter not enabled");
D_PRINT("filter not enabled\n");
#endif

break;
Expand All @@ -181,7 +181,7 @@ main(int argc, char **argv)
printf("Test filter: %s\n", filter);
}
#else
D_PRINT("filter not enabled");
D_PRINT("filter not enabled\n");
#endif
break;
case FORCE_CSUM:
Expand Down
Loading
Loading