From fb9bc6e3ddba81b9455870bbe00e4c60352067a8 Mon Sep 17 00:00:00 2001 From: Sitsofe Wheeler Date: Wed, 16 Aug 2017 21:45:35 +0100 Subject: [PATCH] configure: fail rbd configure check on wrong rados_create2 signature Alter the rbd/rados/ceph configure check so it will fail if the rados_create2() signature is incorrect or if the function is unavailable. Completes the suggestion in commit ff56a4e2e0a87e4e3b1cc1e74547d55b295967a6 ("travis: don't enable rbd"). Signed-off-by: Sitsofe Wheeler --- configure | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index afb88cac..59af1b6c 100755 --- a/configure +++ b/configure @@ -1483,12 +1483,16 @@ int main(int argc, char **argv) { rados_t cluster; rados_ioctx_t io_ctx; + const char cluster_name[] = "ceph"; + const char user_name[] = "client.admin"; const char pool[] = "rbd"; - int major, minor, extra; - rbd_version(&major, &minor, &extra); + rbd_version(&major, &minor, &extra); + /* The rados_create2 signature required was only introduced in ceph 0.65 */ + rados_create2(&cluster, cluster_name, user_name, 0); rados_ioctx_create(cluster, pool, &io_ctx); + return 0; } EOF -- 2.25.1