]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/librbd/fsx: respect rbd_default_map_options in krbd_open()
authorIlya Dryomov <idryomov@gmail.com>
Thu, 9 Jul 2020 20:27:41 +0000 (22:27 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Fri, 10 Jul 2020 18:12:53 +0000 (20:12 +0200)
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
src/test/librbd/fsx.cc

index 503e0b2af2db0cf7434e1c656026c50f5c6dda90..bbdc86e667bb1116d66761e56cfe7c56a74b4bd6 100644 (file)
@@ -949,6 +949,7 @@ const struct rbd_operations librbd_operations = {
 int
 krbd_open(const char *name, struct rbd_ctx *ctx)
 {
+       char buf[1024];
        char *devnode;
        int fd;
        int ret;
@@ -957,7 +958,14 @@ krbd_open(const char *name, struct rbd_ctx *ctx)
        if (ret < 0)
                return ret;
 
-       ret = krbd_map(krbd, pool, "", name, "", "", &devnode);
+       ret = rados_conf_get(cluster, "rbd_default_map_options", buf,
+                            sizeof(buf));
+       if (ret < 0) {
+               simple_err("Could not get rbd_default_map_options value", ret);
+               return ret;
+       }
+
+       ret = krbd_map(krbd, pool, "", name, "", buf, &devnode);
        if (ret < 0) {
                prt("krbd_map(%s) failed\n", name);
                return ret;