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-16251 engine: Misc fixes and cleanups #14983

Merged
merged 1 commit into from
Aug 26, 2024
Merged

DAOS-16251 engine: Misc fixes and cleanups #14983

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
4 changes: 2 additions & 2 deletions src/engine/server_iv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}

Expand Down
6 changes: 2 additions & 4 deletions src/pool/srv_iv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
Expand Down
Loading