From: Sage Weil <sage@inktank.com>
Date: Tue, 9 Oct 2012 16:22:48 +0000 (-0700)
Subject: rbd: print useful error message if striping is specified for format 1
X-Git-Tag: v0.55~250^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04d32e7eeb285dfc2cdfde3dc10d7f79c5e3c44e;p=ceph.git

rbd: print useful error message if striping is specified for format 1

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/rbd.cc b/src/rbd.cc
index 276ab69b4633..4d1d3a7ac98d 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -260,9 +260,15 @@ static int do_create(librbd::RBD &rbd, librados::IoCtx& io_ctx,
 {
   int r;
 
-  if (format == 1)
+  if (format == 1) {
+    // weird striping not allowed with format 1!
+    if ((stripe_unit || stripe_count) &&
+	(stripe_unit != (1ull << *order) && stripe_count != 1)) {
+      cerr << "non-default striping not allowed with format 1; use --format 2" << std::endl;
+      return -EINVAL;
+    }
     r = rbd.create(io_ctx, imgname, size, order);
-  else {
+  } else {
     if (features == 0) {
       features = RBD_FEATURE_LAYERING;
     }