Merge pull request #7026 from xdonghai/master

rbd: must specify both of stripe-unit and stripe-count when specifying stripingv2 feature Reviewed-by: Josh Durgin <jdurgin@redhat.com>
ceph · Dec 23, 2015 · f8c4d04 · f8c4d04
2 parents ea131fe + 54b12f5
commit f8c4d04
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc
@@ -366,6 +366,10 @@ int get_image_options(const boost::program_options::variables_map &vm,
     }
     features |= RBD_FEATURE_STRIPINGV2;
   } else {
+    if (features_specified && ((features & RBD_FEATURE_STRIPINGV2) != 0)) {
+      std::cerr << "must specify both of stripe-unit and stripe-count when specify striping features" << std::endl;
+      return -EINVAL;
+    }
     features &= ~RBD_FEATURE_STRIPINGV2;
   }