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

DAOS Driver: Update License & Align with 1.0 API changes 

- License should inherit from IOR License.
- remove checksums from Array API
- add DFS dir oclass option

Signed-off-by: Mohamad Chaarawi <mohamad.chaarawi@intel.com>
master
Mohamad Chaarawi 2020-02-24 18:59:40 +00:00
parent 3a34b2efb7
commit 50a4ba0735
2 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/aiori-DAOS.c
View File

@ -1,16 +1,9 @@
/* /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8: * vim:expandtab:shiftwidth=8:tabstop=8:
*/ */
/* /*
* Copyright (C) 2018-2019 Intel Corporation * Copyright (C) 2018-2020 Intel Corporation
* * See the file COPYRIGHT for a complete copyright notice and license.
* GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE
* The Government's rights to use, modify, reproduce, release, perform, display,
* or disclose this software are subject to the terms of the Apache License as
* provided in Contract No. 8F-30005.
* Any reproduction of computer software, computer software documentation, or
* portions thereof marked with this legend must also reproduce the markings.
*/ */
/* /*
@ -444,10 +437,10 @@ DAOS_Xfer(int access, void *file, IOR_size_t *buffer,
sgl.sg_iovs = &iov; sgl.sg_iovs = &iov;
if (access == WRITE) { if (access == WRITE) {
rc = daos_array_write(aoh, DAOS_TX_NONE, &iod, &sgl, NULL, NULL); rc = daos_array_write(aoh, DAOS_TX_NONE, &iod, &sgl, NULL);
DCHECK(rc, "daos_array_write() failed (%d).", rc); DCHECK(rc, "daos_array_write() failed (%d).", rc);
} else { } else {
rc = daos_array_read(aoh, DAOS_TX_NONE, &iod, &sgl, NULL, NULL); rc = daos_array_read(aoh, DAOS_TX_NONE, &iod, &sgl, NULL);
DCHECK(rc, "daos_array_read() failed (%d).", rc); DCHECK(rc, "daos_array_read() failed (%d).", rc);
} }

28
src/aiori-DFS.c
View File

@ -2,14 +2,8 @@
* vim:expandtab:shiftwidth=8:tabstop=8: * vim:expandtab:shiftwidth=8:tabstop=8:
*/ */
/* /*
* Copyright (C) 2018-2019 Intel Corporation * Copyright (C) 2018-2020 Intel Corporation
* * See the file COPYRIGHT for a complete copyright notice and license.
* GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE
* The Government's rights to use, modify, reproduce, release, perform, display,
* or disclose this software are subject to the terms of the Apache License as
* provided in Contract No. 8F-30005.
* Any reproduction of computer software, computer software documentation, or
* portions thereof marked with this legend must also reproduce the markings.
*/ */
/* /*
@ -46,6 +40,7 @@
dfs_t *dfs; dfs_t *dfs;
static daos_handle_t poh, coh; static daos_handle_t poh, coh;
static daos_oclass_id_t objectClass = OC_SX; static daos_oclass_id_t objectClass = OC_SX;
static daos_oclass_id_t dir_oclass = OC_SX;
static struct d_hash_table *dir_hash; static struct d_hash_table *dir_hash;
struct aiori_dir_hdl { struct aiori_dir_hdl {
@ -68,6 +63,7 @@ struct dfs_options{
char *cont; char *cont;
int chunk_size; int chunk_size;
char *oclass; char *oclass;
char *dir_oclass;
char *prefix; char *prefix;
int destroy; int destroy;
}; };
@ -79,6 +75,7 @@ static struct dfs_options o = {
.cont = NULL, .cont = NULL,
.chunk_size = 1048576, .chunk_size = 1048576,
.oclass = NULL, .oclass = NULL,
.dir_oclass = NULL,
.prefix = NULL, .prefix = NULL,
.destroy = 0, .destroy = 0,
}; };
@ -90,6 +87,7 @@ static option_help options [] = {
{0, "dfs.cont", "DFS container uuid", OPTION_OPTIONAL_ARGUMENT, 's', & o.cont}, {0, "dfs.cont", "DFS container uuid", OPTION_OPTIONAL_ARGUMENT, 's', & o.cont},
{0, "dfs.chunk_size", "chunk size", OPTION_OPTIONAL_ARGUMENT, 'd', &o.chunk_size}, {0, "dfs.chunk_size", "chunk size", OPTION_OPTIONAL_ARGUMENT, 'd', &o.chunk_size},
{0, "dfs.oclass", "object class", OPTION_OPTIONAL_ARGUMENT, 's', &o.oclass}, {0, "dfs.oclass", "object class", OPTION_OPTIONAL_ARGUMENT, 's', &o.oclass},
{0, "dfs.dir_oclass", "directory object class", OPTION_OPTIONAL_ARGUMENT, 's', &o.dir_oclass},
{0, "dfs.prefix", "mount prefix", OPTION_OPTIONAL_ARGUMENT, 's', & o.prefix}, {0, "dfs.prefix", "mount prefix", OPTION_OPTIONAL_ARGUMENT, 's', & o.prefix},
{0, "dfs.destroy", "Destroy DFS Container", OPTION_FLAG, 'd', &o.destroy}, {0, "dfs.destroy", "Destroy DFS Container", OPTION_FLAG, 'd', &o.destroy},
LAST_OPTION LAST_OPTION
@ -385,7 +383,13 @@ DFS_Init() {
if (o.oclass) { if (o.oclass) {
objectClass = daos_oclass_name2id(o.oclass); objectClass = daos_oclass_name2id(o.oclass);
if (objectClass == OC_UNKNOWN) if (objectClass == OC_UNKNOWN)
GERR("Invalid DAOS Object class %s\n", o.oclass); GERR("Invalid DAOS object class %s\n", o.oclass);
}
if (o.dir_oclass) {
dir_oclass = daos_oclass_name2id(o.dir_oclass);
if (dir_oclass == OC_UNKNOWN)
GERR("Invalid DAOS directory object class %s\n", o.dir_oclass);
} }
rc = daos_init(); rc = daos_init();
@ -506,7 +510,7 @@ DFS_Create(char *testFileName, IOR_param_t *param)
{ {
char *name = NULL, *dir_name = NULL; char *name = NULL, *dir_name = NULL;
dfs_obj_t *obj = NULL, *parent = NULL; dfs_obj_t *obj = NULL, *parent = NULL;
mode_t mode; mode_t mode = 0644;
int fd_oflag = 0; int fd_oflag = 0;
int rc; int rc;
@ -767,15 +771,13 @@ DFS_Mkdir(const char *path, mode_t mode, IOR_param_t * param)
if (parent == NULL) if (parent == NULL)
GERR("Failed to lookup parent dir"); GERR("Failed to lookup parent dir");
rc = dfs_mkdir(dfs, parent, name, mode); rc = dfs_mkdir(dfs, parent, name, mode, dir_oclass);
DCHECK(rc, "dfs_mkdir() of %s Failed", name); DCHECK(rc, "dfs_mkdir() of %s Failed", name);
if (name) if (name)
free(name); free(name);
if (dir_name) if (dir_name)
free(dir_name); free(dir_name);
if (rc)
return -1;
return rc; return rc;
} }