Merge pull request #11744 from trociny/wip-16962

rbd-mirror: snap protect of non-layered image results in split-brain Reviewed-by: Jason Dillaman <dillaman@redhat.com>
ceph · Nov 4, 2016 · 740ac05 · 740ac05
2 parents ff00d41 + 8e1cc88
commit 740ac05
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/librbd/Operations.cc b/src/librbd/Operations.cc
@@ -1020,6 +1020,11 @@ int Operations<I>::snap_protect(const char *snap_name) {
     return -EROFS;
   }
 
+  if (!m_image_ctx.test_features(RBD_FEATURE_LAYERING)) {
+    lderr(cct) << "image must support layering" << dendl;
+    return -ENOSYS;
+  }
+
   int r = m_image_ctx.state->refresh_if_required();
   if (r < 0) {
     return r;