Skip to content

DAOS-17550 object: refine dc_array_set_size processing #16404

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
wants to merge 2 commits into
base: release/2.6
Choose a base branch
from
Open

DAOS-17550 object: refine dc_array_set_size processing #16404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec06fbf
DAOS-17550 object: refine dc_array_set_size processing
liuxuezhao May 18, 2025
1730eed
Merge branch 'release/2.6' into lxz/key_cmp_fix_26
liuxuezhao May 27, 2025
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
77 changes: 58 additions & 19 deletions src/client/array/dc_array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1887,9 +1887,9 @@ dc_array_punch(tse_task_t *task)
DAOS_OPC_ARRAY_PUNCH, task);
}

#define ENUM_KEY_BUF 32
#define ENUM_DESC_BUF 512
#define ENUM_DESC_NR 5
#define ENUM_DESC_BUF 512
#define ENUM_DESC_NR 16
#define ENUM_DESC_NR_MAX 2048

struct key_query_props {
struct dc_array *array;
Expand Down Expand Up @@ -2089,11 +2089,15 @@ dc_array_stat(tse_task_t *task)

struct set_size_props {
struct dc_array *array;
char buf[ENUM_DESC_BUF];
daos_key_desc_t kds[ENUM_DESC_NR];
char buf_inline[ENUM_DESC_BUF];
daos_key_desc_t kds_inline[ENUM_DESC_NR];
daos_key_desc_t *kds;
char *buf;
char *val;
d_iov_t iov;
d_sg_list_t sgl;
uint32_t kds_size;
uint32_t buf_len;
uint32_t nr;
daos_anchor_t anchor;
bool update_dkey;
Expand All @@ -2111,6 +2115,10 @@ free_set_size_cb(tse_task_t *task, void *data)
{
struct set_size_props *props = *((struct set_size_props **)data);

if (props->kds != props->kds_inline)
D_FREE(props->kds);
if (props->buf != props->buf_inline)
D_FREE(props->buf);
D_FREE(props->val);
if (props->array)
array_decref(props->array);
Expand Down Expand Up @@ -2539,10 +2547,37 @@ adjust_array_size_cb(tse_task_t *task, void *data)
}

if (!daos_anchor_is_eof(args->dkey_anchor)) {
props->nr = ENUM_DESC_NR;
memset(props->buf, 0, ENUM_DESC_BUF);
/* if with more dkeys, double the memory for list dkey to save #RPCs */
if (props->nr == props->kds_size && props->kds_size * 2 <= ENUM_DESC_NR_MAX) {
uint32_t new_buf_len;
uint32_t new_kds_size;
char *new_buf;
daos_key_desc_t *new_kds;

new_buf_len = props->buf_len * 2;
D_ALLOC(new_buf, new_buf_len);
if (new_buf == NULL)
D_GOTO(out, rc = -DER_NOMEM);
new_kds_size = props->kds_size * 2;
D_ALLOC_ARRAY(new_kds, new_kds_size);
if (new_kds == NULL) {
D_FREE(new_buf);
D_GOTO(out, rc = -DER_NOMEM);
}
if (props->kds != props->kds_inline)
D_FREE(props->kds);
if (props->buf != props->buf_inline)
D_FREE(props->buf);
props->buf = new_buf;
props->buf_len = new_buf_len;
props->kds = new_kds;
props->kds_size = new_kds_size;
args->kds = props->kds;
}
props->nr = props->kds_size;
memset(props->buf, 0, props->buf_len);
args->sgl->sg_nr = 1;
d_iov_set(&args->sgl->sg_iovs[0], props->buf, ENUM_DESC_BUF);
d_iov_set(&args->sgl->sg_iovs[0], props->buf, props->buf_len);

rc = tse_task_register_cbs(task, NULL, NULL, 0, adjust_array_size_cb, &props,
sizeof(props));
Expand Down Expand Up @@ -2612,25 +2647,29 @@ dc_array_set_size(tse_task_t *task)
if (set_size_props == NULL)
D_GOTO(err_task, rc = -DER_NOMEM);

set_size_props->dkey_val = dkey_val;
set_size_props->array = array;
set_size_props->cell_size = array->cell_size;
set_size_props->dkey_val = dkey_val;
set_size_props->array = array;
set_size_props->cell_size = array->cell_size;
set_size_props->num_records = num_records;
set_size_props->record_i = record_i;
set_size_props->chunk_size = array->chunk_size;
set_size_props->nr = ENUM_DESC_NR;
set_size_props->size = args->size;
set_size_props->ptask = task;
set_size_props->val = NULL;
set_size_props->record_i = record_i;
set_size_props->chunk_size = array->chunk_size;
set_size_props->nr = ENUM_DESC_NR;
set_size_props->kds_size = ENUM_DESC_NR;
set_size_props->size = args->size;
set_size_props->ptask = task;
set_size_props->val = NULL;
set_size_props->kds = set_size_props->kds_inline;
set_size_props->buf = set_size_props->buf_inline;
set_size_props->buf_len = ENUM_DESC_BUF;
if (args->size == 0)
set_size_props->update_dkey = false;
else
set_size_props->update_dkey = true;
memset(set_size_props->buf, 0, ENUM_DESC_BUF);
memset(set_size_props->buf, 0, set_size_props->buf_len);
memset(&set_size_props->anchor, 0, sizeof(set_size_props->anchor));
set_size_props->sgl.sg_nr = 1;
set_size_props->sgl.sg_iovs = &set_size_props->iov;
d_iov_set(&set_size_props->sgl.sg_iovs[0], set_size_props->buf, ENUM_DESC_BUF);
d_iov_set(&set_size_props->sgl.sg_iovs[0], set_size_props->buf, set_size_props->buf_len);

rc = daos_task_create(DAOS_OPC_OBJ_LIST_DKEY, tse_task2sched(task), 0, NULL, &enum_task);
if (rc)
Expand Down
12 changes: 11 additions & 1 deletion src/object/cli_obj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3573,7 +3573,7 @@ merge_key(struct dc_object *obj, d_list_t *head, char *key, int key_size)

d_list_for_each_entry(key_one, head, key_list) {
if (key_size == key_one->key.iov_len &&
strncmp(key_one->key.iov_buf, key, key_size) == 0) {
memcmp(key_one->key.iov_buf, key, key_size) == 0) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes that makes sense because integer dkeys are not strings

return 0;
}
}
Expand Down Expand Up @@ -6138,6 +6138,16 @@ sub_anchors_prep(struct obj_auxi_args *obj_auxi, int shards_nr)
D_ASSERTF(nr >= shards_nr, "nr %d shards_nr %d\n", nr, shards_nr);
buf_size /= shards_nr;
nr /= shards_nr;
} else if ((obj_auxi->opc == DAOS_OBJ_DKEY_RPC_ENUMERATE ||
obj_auxi->opc == DAOS_OBJ_AKEY_RPC_ENUMERATE) &&
shards_nr > 2 && nr >= shards_nr * 4) {
/* for EC object key enumerate, enumerate less keys from each shard
* to avoid duplicate enumerate.
*/
int tmp_nr = shards_nr / 2;

nr = roundup(nr / tmp_nr, 4);
buf_size = roundup(buf_size / tmp_nr, 64);
}

obj_auxi->sub_anchors = 1;
Expand Down
Loading