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

Merge pull request #224 from markhpc/wip-aiori-cephfs-checks 

src/aiori-CEPHFS: Option warnings, shutdown checks, and cmount nullification
master
Julian Kunkel 2020-05-29 10:13:15 +01:00 committed by GitHub
parent 2711ae5257 edba70e99c
commit 314871e92d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/aiori-CEPHFS.c
View File

@ -125,6 +125,12 @@ static option_help * CEPHFS_options(){
static void CEPHFS_Init() static void CEPHFS_Init()
{ {
/* Short circuit if the options haven't been filled yet. */
if (!o.user || !o.conf || !o.prefix) {
WARN("CEPHFS_Init() called before options have been populated!");
return;
}
/* Short circuit if the mount handle already exists */ /* Short circuit if the mount handle already exists */
if (cmount) { if (cmount) {
return; return;
@ -167,7 +173,15 @@ static void CEPHFS_Init()
static void CEPHFS_Final() static void CEPHFS_Final()
{ {
/* shutdown */ /* shutdown */
ceph_shutdown(cmount); int ret = ceph_unmount(cmount);
if (ret < 0) {
CEPHFS_ERR("ceph_umount failed", ret);
}
ret = ceph_release(cmount);
if (ret < 0) {
CEPHFS_ERR("ceph_release failed", ret);
}
cmount = NULL;
} }
static void *CEPHFS_Create(char *testFileName, IOR_param_t * param) static void *CEPHFS_Create(char *testFileName, IOR_param_t * param)
@ -267,7 +281,6 @@ static void CEPHFS_Close(void *file, IOR_param_t * param)
CEPHFS_ERR("ceph_close failed", ret); CEPHFS_ERR("ceph_close failed", ret);
} }
free(file); free(file);
return; return;
} }