mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rbd: ignore failures when reading from default conf location

Browse Source 
If we are reading from the default config location, ignore any failures.
It is perfectly legal for the user to specify exactly the options they need
and to not rely on any config file.

Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Sage Weil 2011-09-15 14:11:08 -07:00 committed by Kevin Wolf
parent a26a13da68
commit f9fe18ec77
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block/rbd.c
View File

@ -298,11 +298,8 @@ static int qemu_rbd_create(const char *filename, QEMUOptionParameter *options)
} }
if (strstr(conf, "conf=") == NULL) { if (strstr(conf, "conf=") == NULL) {
if (rados_conf_read_file(cluster, NULL) < 0) { /* try default location, but ignore failure */
error_report("error reading config file"); rados_conf_read_file(cluster, NULL);
rados_shutdown(cluster);
return -EIO;
}
} }
if (conf[0] != '\0' && if (conf[0] != '\0' &&
@ -441,11 +438,8 @@ static int qemu_rbd_open(BlockDriverState *bs, const char *filename, int flags)
} }
if (strstr(conf, "conf=") == NULL) { if (strstr(conf, "conf=") == NULL) {
r = rados_conf_read_file(s->cluster, NULL); /* try default location, but ignore failure */
if (r < 0) { rados_conf_read_file(s->cluster, NULL);
error_report("error reading config file");
goto failed_shutdown;
}
} }
if (conf[0] != '\0') { if (conf[0] != '\0') {