Skip to content

Commit

Permalink
librbd: don't remove an image w/ incompatible features
Browse files Browse the repository at this point in the history
Fixes: http://tracker.ceph.com/issues/18315
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
(cherry picked from commit f76127b)

Conflicts:
	src/librbd/internal.cc - trivial conflict with
            3df756c which is not needed in
            hammer
  • Loading branch information
yangdongsheng authored and smithfarm committed Feb 3, 2017
1 parent 83af8cd commit dbb3687
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/librbd/internal.cc
Expand Up @@ -1722,6 +1722,9 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
int r = open_image(ictx);
if (r < 0) {
ldout(cct, 2) << "error opening image: " << cpp_strerror(-r) << dendl;
if (r != -ENOENT) {
return r;
}
} else {
string header_oid = ictx->header_oid;
old_format = ictx->old_format;
Expand Down

0 comments on commit dbb3687

Please sign in to comment.