Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,8 @@ pipeline {
steps {
job_step_update(
testRpm(inst_repos: daosRepos(),
daos_pkg_version: daosPackagesVersion(next_version()))
daos_pkg_version: daosPackagesVersion(next_version()),
inst_rpms: 'mercury-libfabric')
)
}
post {
Expand Down Expand Up @@ -1100,7 +1101,8 @@ pipeline {
} */
job_step_update(
testRpm(inst_repos: daosRepos(),
daos_pkg_version: daosPackagesVersion(next_version()))
daos_pkg_version: daosPackagesVersion(next_version()),
inst_rpms: 'mercury-libfabric')
)
}
post {
Expand Down
4 changes: 4 additions & 0 deletions src/container/srv_cli.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ dsc_cont_init_props(struct dc_cont *cont, uuid_t pool_uuid, uuid_t cont_uuid)
{
int rc;

D_DEBUG(DB_MD, DF_CONT": get props: begin\n",
DP_CONT(pool_uuid, cont_uuid));
rc = ds_cont_get_props(&cont->dc_props, pool_uuid, cont_uuid);
D_DEBUG(DB_MD, DF_CONT": get props: end: "DF_RC"\n",
DP_CONT(pool_uuid, cont_uuid), DP_RC(rc));
if (rc)
return rc;

Expand Down
9 changes: 9 additions & 0 deletions src/container/srv_container.c
Original file line number Diff line number Diff line change
Expand Up @@ -6189,6 +6189,9 @@ ds_cont_get_prop(uuid_t pool_uuid, uuid_t cont_uuid, daos_prop_t **prop_out)
struct cont *cont = NULL;
int rc;

D_DEBUG(DB_MD, DF_CONT": begin\n",
DP_CONT(pool_uuid, cont_uuid));

D_ASSERT(dss_get_module_info()->dmi_xs_id == 0);
rc = cont_svc_lookup_leader(pool_uuid, 0, &svc, NULL);
if (rc != 0) {
Expand All @@ -6201,7 +6204,11 @@ ds_cont_get_prop(uuid_t pool_uuid, uuid_t cont_uuid, daos_prop_t **prop_out)
if (rc != 0)
D_GOTO(out_put, rc);

D_DEBUG(DB_MD, DF_CONT": lock svc: begin\n",
DP_CONT(pool_uuid, cont_uuid));
ABT_rwlock_rdlock(svc->cs_lock);
D_DEBUG(DB_MD, DF_CONT": lock svc: end\n",
DP_CONT(pool_uuid, cont_uuid));
rc = cont_lookup(&tx, svc, cont_uuid, &cont);
if (rc != 0) {
DL_ERROR(rc, DF_CONT " cont_lookup failed", DP_CONT(pool_uuid, cont_uuid));
Expand All @@ -6224,6 +6231,8 @@ ds_cont_get_prop(uuid_t pool_uuid, uuid_t cont_uuid, daos_prop_t **prop_out)
rdb_tx_end(&tx);
out_put:
cont_svc_put_leader(svc);
D_DEBUG(DB_MD, DF_CONT": end: "DF_RC"\n",
DP_CONT(pool_uuid, cont_uuid), DP_RC(rc));
return rc;
}

Expand Down
Loading