vitalif
/
mdtest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update DAOS and DFS drivers with new DAOS API changes. 

Signed-off-by: Mohamad Chaarawi <mohamad.chaarawi@intel.com>
master
Mohamad Chaarawi 2019-02-08 18:00:33 +00:00
parent 2c87b5e0f5
commit 29090df283
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/aiori-DAOS.c
View File

@ -244,7 +244,7 @@ static void ContainerOpen(char *testFileName, IOR_param_t *param,
param->useExistingTestFile == FALSE) {
INFO(VERBOSE_2, "Creating container %s", testFileName);
rc = daos_cont_create(pool, uuid, NULL /* ev */);
rc = daos_cont_create(pool, uuid, NULL, NULL);
DCHECK(rc, "Failed to create container %s",
testFileName);
}
@ -594,12 +594,14 @@ kill_daos_server(IOR_param_t *param)
{
daos_pool_info_t info;
d_rank_t d_rank, svc_ranks[13];
d_rank_list_t svc, targets;
d_rank_list_t svc;
struct d_tgt_list targets;
int tgt_idx = -1;
uuid_t uuid;
char *s;
int rc;
rc = daos_pool_query(pool, NULL, &info, NULL);
rc = daos_pool_query(pool, NULL, &info, NULL, NULL);
DCHECK(rc, "Error in querying pool\n");
if (info.pi_ntargets - info.pi_ndisabled <= 1)
@ -618,16 +620,16 @@ kill_daos_server(IOR_param_t *param)
rc = daos_mgmt_svc_rip(o.daosGroup, d_rank, true, NULL);
DCHECK(rc, "Error in killing server\n");
targets.rl_nr = 1;
targets.rl_ranks = &d_rank;
targets.tl_nr = 1;
targets.tl_ranks = &d_rank;
targets.tl_tgts = &tgt_idx;
svc.rl_ranks = svc_ranks;
ParseService(sizeof(svc_ranks)/ sizeof(svc_ranks[0]), &svc);
rc = daos_pool_exclude(uuid, NULL, &svc, &targets, NULL);
rc = daos_pool_tgt_exclude(uuid, NULL, &svc, &targets, NULL);
DCHECK(rc, "Error in excluding pool from poolmap\n");
rc = daos_pool_query(pool, NULL, &info, NULL);
rc = daos_pool_query(pool, NULL, &info, NULL, NULL);
DCHECK(rc, "Error in querying pool\n");
printf("%d targets succesfully disabled\n",

2
src/aiori-DFS.c
View File

@ -261,7 +261,7 @@ DFS_Init() {
if (rc == -DER_NONEXIST) {
if (verbose >= VERBOSE_1)
printf("Creating DFS Container ...\n");
rc = daos_cont_create(poh, co_uuid, NULL);
rc = daos_cont_create(poh, co_uuid, NULL, NULL);
if (rc == 0) {
cont_created = true;
rc = daos_cont_open(poh, co_uuid, DAOS_COO_RW, &coh,