Skip to content
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

daos: support for additional container property #5

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

daos: support for additional container property #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce0cdf9
daos: fix to support new DAOS api
Nov 17, 2021
03d25d9
Merge pull request #3 from daos-stack/shilongw/DAOS-8690
johannlombardi Nov 17, 2021
b24b095
daos: support for additional container property
ryon-jensen Nov 30, 2023
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
100 changes: 65 additions & 35 deletions src/common/mfu_daos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@
#endif
#endif

#if defined(DAOS_API_VERSION_MAJOR) && defined(DAOS_API_VERSION_MINOR)
#define CHECK_DAOS_API_VERSION(major, minor) \
((DAOS_API_VERSION_MAJOR > (major)) \
|| (DAOS_API_VERSION_MAJOR == (major) && DAOS_API_VERSION_MINOR >= (minor)))
#else
#define CHECK_DAOS_API_VERSION(major, minor) 0
#endif

/*
* Private definitions.
* TODO - Need to reorganize some functions in this file.
Expand Down Expand Up @@ -687,10 +695,10 @@ static int cont_get_props(daos_handle_t coh, daos_prop_t** _props,
daos_prop_t* prop_acl = NULL;
daos_prop_t* props_merged = NULL;
/* total amount of properties to allocate */
uint32_t total_props = 15;
uint32_t total_props = 16;
/* minimum number of properties that are always allocated/used to start
* count */
int prop_index = 15;
int prop_index = 16;

if (get_oid) {
total_props++;
Expand Down Expand Up @@ -732,6 +740,7 @@ static int cont_get_props(daos_handle_t coh, daos_prop_t** _props,
props->dpp_entries[12].dpe_type = DAOS_PROP_CO_DEDUP;
props->dpp_entries[13].dpe_type = DAOS_PROP_CO_DEDUP_THRESHOLD;
props->dpp_entries[14].dpe_type = DAOS_PROP_CO_EC_CELL_SZ;
props->dpp_entries[15].dpe_type = DAOS_PROP_CO_SCRUBBER_DISABLED;

/* Conditionally get the OID. Should always be true for serialization. */
if (get_oid) {
Expand Down Expand Up @@ -3209,7 +3218,7 @@ static int serialize_dkeys(struct hdf5_args *hdf5,
int *oid_index,
daos_args_t *da,
daos_obj_id_t oid,
bool is_kv_flat,
bool is_kv,
mfu_daos_stats_t* stats)
{
int rc = 0;
Expand Down Expand Up @@ -3247,7 +3256,7 @@ static int serialize_dkeys(struct hdf5_args *hdf5,

d_iov_set(&dkey_iov, dkey_enum_buf, ENUM_DESC_BUF);

if (is_kv_flat) {
if (is_kv) {
rc = daos_kv_list(*oh, DAOS_TX_NONE, &dkey_number,
dkey_kds, &dkey_sgl, &dkey_anchor, NULL);
if (rc != 0) {
Expand Down Expand Up @@ -3292,7 +3301,7 @@ static int serialize_dkeys(struct hdf5_args *hdf5,
dkey_val->len = (uint64_t)dkey_kds[i].kd_key_len;
(*hdf5->dk)[*dk_index].rec_kv_val.p = NULL;
(*hdf5->dk)[*dk_index].rec_kv_val.len = 0;
if (is_kv_flat) {
if (is_kv) {
/* akey offset will not be used in this case */
(*hdf5->dk)[*dk_index].akey_offset = 0;

Expand Down Expand Up @@ -4105,26 +4114,32 @@ int cont_serialize_props(struct hdf5_args *hdf5,
}

entry = &prop_query->dpp_entries[15];
rc = cont_serialize_prop_uint(hdf5, entry, "DAOS_PROP_CO_ALLOCED_OID");
rc = cont_serialize_prop_uint(hdf5, entry, "DAOS_PROP_CO_SCRUBBER_DISABLED");
if (rc != 0) {
goto out;
}

entry = &prop_query->dpp_entries[16];
rc = cont_serialize_prop_str(hdf5, entry, "DAOS_PROP_CO_LABEL");
rc = cont_serialize_prop_uint(hdf5, entry, "DAOS_PROP_CO_ALLOCED_OID");
if (rc != 0) {
goto out;
}

entry = &prop_query->dpp_entries[17];
rc = cont_serialize_prop_str(hdf5, entry, "DAOS_PROP_CO_LABEL");
if (rc != 0) {
goto out;
}

entry = &prop_query->dpp_entries[18];
rc = cont_serialize_prop_roots(hdf5, entry, "DAOS_PROP_CO_ROOTS");
if (rc != 0) {
goto out;
}

/* serialize ACL */
if (prop_query->dpp_nr > 18) {
entry = &prop_query->dpp_entries[18];
if (prop_query->dpp_nr > 19) {
entry = &prop_query->dpp_entries[19];
rc = cont_serialize_prop_acl(hdf5, entry, "DAOS_PROP_CO_ACL");
if (rc != 0) {
goto out;
Expand All @@ -4136,6 +4151,23 @@ int cont_serialize_props(struct hdf5_args *hdf5,
return rc;
}

static bool obj_is_kv(daos_obj_id_t oid)
{

#if CHECK_DAOS_API_VERSION(2, 0)
return daos_obj_id2type(oid) == DAOS_OT_KV_HASHED;
#else
daos_ofeat_t ofeat;

ofeat = (oid.hi & OID_FMT_FEAT_MASK) >> OID_FMT_FEAT_SHIFT;
if ((ofeat & DAOS_OF_KV_FLAT) &&
!(ofeat & DAOS_OF_ARRAY_BYTE) && !(ofeat & DAOS_OF_ARRAY)) {
return true;
}
return false;
#endif
}

int daos_cont_serialize_hdlr(int rank, struct hdf5_args *hdf5, char *output_dir,
uint64_t *files_written, daos_args_t *da,
mfu_flist flist, uint64_t num_oids,
Expand All @@ -4153,8 +4185,7 @@ int daos_cont_serialize_hdlr(int rank, struct hdf5_args *hdf5, char *output_dir,
herr_t err = 0;
char *filename = NULL;
char cont_str[FILENAME_LEN];
daos_ofeat_t ofeat;
bool is_kv_flat = false;
bool is_kv = false;
int size = 0;

/* init HDF5 args */
Expand Down Expand Up @@ -4213,23 +4244,20 @@ int daos_cont_serialize_hdlr(int rank, struct hdf5_args *hdf5, char *output_dir,
(*hdf5->oid)[i].oid_hi = oid.hi;
(*hdf5->oid)[i].oid_low = oid.lo;

is_kv = obj_is_kv(oid);
/* TODO: DAOS_OF_KV_FLAT uses daos_kv_* functions, and
* other object types use daos_obj_* functions. Maybe there is
* a better way to organize this with swtich statements, or
* creating "daos_obj" wrappers, etc. */
ofeat = (oid.hi & OID_FMT_FEAT_MASK) >> OID_FMT_FEAT_SHIFT;
if ((ofeat & DAOS_OF_KV_FLAT) &&
!(ofeat & DAOS_OF_ARRAY_BYTE) && !(ofeat & DAOS_OF_ARRAY)) {
is_kv_flat = true;
}
if (is_kv_flat) {

if (is_kv) {
rc = daos_kv_open(da->src_coh, oid, DAOS_OO_RW, &oh, NULL);
if (rc != 0) {
MFU_LOG(MFU_LOG_ERR, "failed to open kv object: "DF_RC, DP_RC(rc));
goto out;
}
rc = serialize_dkeys(hdf5, &dk_index, &ak_index,
&oh, &i, da, oid, is_kv_flat, stats);
&oh, &i, da, oid, is_kv, stats);
if (rc != 0) {
MFU_LOG(MFU_LOG_ERR, "failed to serialize keys: %d", rc);
goto out;
Expand All @@ -4247,7 +4275,7 @@ int daos_cont_serialize_hdlr(int rank, struct hdf5_args *hdf5, char *output_dir,
goto out;
}
rc = serialize_dkeys(hdf5, &dk_index, &ak_index,
&oh, &i, da, oid, is_kv_flat, stats);
&oh, &i, da, oid, is_kv, stats);
if (rc != 0) {
MFU_LOG(MFU_LOG_ERR, "failed to serialize keys: %d", rc);
goto out;
Expand Down Expand Up @@ -5378,11 +5406,12 @@ int cont_deserialize_all_props(struct hdf5_args *hdf5,
prop->dpp_entries[12].dpe_type = DAOS_PROP_CO_DEDUP;
prop->dpp_entries[13].dpe_type = DAOS_PROP_CO_DEDUP_THRESHOLD;
prop->dpp_entries[14].dpe_type = DAOS_PROP_CO_EC_CELL_SZ;
prop->dpp_entries[15].dpe_type = DAOS_PROP_CO_ALLOCED_OID;
prop->dpp_entries[16].dpe_type = DAOS_PROP_CO_ACL;
prop->dpp_entries[17].dpe_type = DAOS_PROP_CO_ROOTS;
prop->dpp_entries[15].dpe_type = DAOS_PROP_CO_SCRUBBER_DISABLED;
prop->dpp_entries[16].dpe_type = DAOS_PROP_CO_ALLOCED_OID;
prop->dpp_entries[17].dpe_type = DAOS_PROP_CO_ACL;
prop->dpp_entries[18].dpe_type = DAOS_PROP_CO_ROOTS;
if (deserialize_label) {
prop->dpp_entries[18].dpe_type = DAOS_PROP_CO_LABEL;
prop->dpp_entries[19].dpe_type = DAOS_PROP_CO_LABEL;
}

entry = &prop->dpp_entries[0];
Expand Down Expand Up @@ -5476,12 +5505,18 @@ int cont_deserialize_all_props(struct hdf5_args *hdf5,
}

entry = &prop->dpp_entries[15];
rc = cont_deserialize_prop_uint(hdf5, entry, "DAOS_PROP_CO_ALLOCED_OID");
rc = cont_deserialize_prop_uint(hdf5, entry, "DAOS_PROP_CO_SCRUBBER_DISABLED");
if (rc != 0) {
goto out;
}

entry = &prop->dpp_entries[16];
rc = cont_deserialize_prop_uint(hdf5, entry, "DAOS_PROP_CO_ALLOCED_OID");
if (rc != 0) {
goto out;
}

entry = &prop->dpp_entries[17];
/* read acl as a list of strings in deserialize, then convert
* back to acl for property entry
*/
Expand All @@ -5490,14 +5525,14 @@ int cont_deserialize_all_props(struct hdf5_args *hdf5,
goto out;
}

entry = &prop->dpp_entries[17];
entry = &prop->dpp_entries[18];
rc = cont_deserialize_prop_roots(hdf5, entry, "DAOS_PROP_CO_ROOTS", roots);
if (rc != 0) {
goto out;
}

if (deserialize_label) {
prop->dpp_entries[18].dpe_str = strdup(label_entry->dpe_str);
prop->dpp_entries[19].dpe_str = strdup(label_entry->dpe_str);
}
*cont_type = prop->dpp_entries[0].dpe_val;
*_prop = prop;
Expand Down Expand Up @@ -5591,7 +5626,7 @@ int daos_cont_deserialize_hdlr(int rank, daos_args_t *da, const char *h5filename
daos_cont_layout_t cont_type;
daos_prop_t* prop;
struct daos_prop_entry *entry;
bool is_kv_flat = false;
bool is_kv = false;

/* init HDF5 args */
init_hdf5_args(&hdf5);
Expand Down Expand Up @@ -5650,16 +5685,11 @@ int daos_cont_deserialize_hdlr(int rank, daos_args_t *da, const char *h5filename
rc = 1;
goto out;
}
daos_ofeat_t ofeat;
for (i = 0; i < (int)hdf5.oid_dims[0]; i++) {
oid.lo = hdf5.oid_data[i].oid_low;
oid.hi = hdf5.oid_data[i].oid_hi;
ofeat = (oid.hi & OID_FMT_FEAT_MASK) >> OID_FMT_FEAT_SHIFT;
if ((ofeat & DAOS_OF_KV_FLAT) &&
!(ofeat & DAOS_OF_ARRAY_BYTE) && !(ofeat & DAOS_OF_ARRAY)) {
is_kv_flat = true;
}
if (is_kv_flat) {
is_kv = obj_is_kv(oid);
if (is_kv) {
rc = daos_kv_open(da->src_coh, oid, DAOS_OO_RW, &oh, NULL);
if (rc != 0) {
MFU_LOG(MFU_LOG_ERR, "Failed to open kv object: "DF_RC, DP_RC(rc));
Expand Down Expand Up @@ -5687,7 +5717,7 @@ int daos_cont_deserialize_hdlr(int rank, daos_args_t *da, const char *h5filename
MFU_LOG(MFU_LOG_ERR, "failed to deserialize keys: %d", rc);
goto out;
}
if (is_kv_flat) {
if (is_kv) {
rc = daos_kv_close(oh, NULL);
if (rc != 0) {
MFU_LOG(MFU_LOG_ERR, "failed to close kv object: "DF_RC, DP_RC(rc));
Expand Down