diff options
| author | Sage Weil <sage@inktank.com> | 2013-07-22 16:53:17 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-22 16:53:17 -0700 |
| commit | bfaf85982282241b6d938e315eaeeb6e01d207d2 (patch) | |
| tree | a8199fbe2ef669a71d7d704f9347fecf28b06d30 | |
| parent | 6582b31abcb36a355b96d63c03ac17021c1e591f (diff) | |
| download | ceph-bfaf85982282241b6d938e315eaeeb6e01d207d2.tar.gz | |
rbd-fuse, ceph_test_librbd_fsx: parse environment after reading config
Otherwise the conf file will clobber your CEPH_CONF arguments and you will
get very confused.
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/rbd_fuse/rbd-fuse.c | 2 | ||||
| -rw-r--r-- | src/test/librbd/fsx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rbd_fuse/rbd-fuse.c b/src/rbd_fuse/rbd-fuse.c index 5a4bfe2702c..2effa7b9512 100644 --- a/src/rbd_fuse/rbd-fuse.c +++ b/src/rbd_fuse/rbd-fuse.c @@ -717,12 +717,12 @@ connect_to_cluster(rados_t *pcluster) simple_err("Could not create cluster handle", r); return r; } - rados_conf_parse_env(*pcluster, NULL); r = rados_conf_read_file(*pcluster, rbd_options.ceph_config); if (r < 0) { simple_err("Error reading Ceph config file", r); goto failed_shutdown; } + rados_conf_parse_env(*pcluster, NULL); r = rados_connect(*pcluster); if (r < 0) { simple_err("Error connecting to cluster", r); diff --git a/src/test/librbd/fsx.c b/src/test/librbd/fsx.c index 97feb4c9896..91aee38536a 100644 --- a/src/test/librbd/fsx.c +++ b/src/test/librbd/fsx.c @@ -498,12 +498,12 @@ create_image() simple_err("Could not create cluster handle", r); return r; } - rados_conf_parse_env(cluster, NULL); r = rados_conf_read_file(cluster, NULL); if (r < 0) { simple_err("Error reading ceph config file", r); goto failed_shutdown; } + rados_conf_parse_env(cluster, NULL); r = rados_connect(cluster); if (r < 0) { simple_err("Error connecting to cluster", r); |