From ab720d4c0026d596dcea8782fbdd1640c93ec384 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 20 Mar 2019 14:40:50 -0400 Subject: [PATCH] librbd: ignore -EOPNOTSUPP errors when retrieving image group membership The Luminous release did not support adding images to a group (it only included the bare-minimum support for creating groups). Commit f76df32666b incorrectly dropped support for ignoring this possible failure. This prevents Nautilus-release clients from opening images contained within a Luminous-release cluster. Fixes: http://tracker.ceph.com/issues/38834 Signed-off-by: Jason Dillaman (cherry picked from commit 6f29dc69a0db3b6d982c95ab9d3b9b00a7029e37) --- src/librbd/image/RefreshRequest.cc | 2 +- src/test/librbd/image/test_mock_RefreshRequest.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librbd/image/RefreshRequest.cc b/src/librbd/image/RefreshRequest.cc index 8679e179af68d..8a93ee109b158 100644 --- a/src/librbd/image/RefreshRequest.cc +++ b/src/librbd/image/RefreshRequest.cc @@ -643,7 +643,7 @@ Context *RefreshRequest::handle_v2_get_group(int *result) { auto it = m_out_bl.cbegin(); cls_client::image_group_get_finish(&it, &m_group_spec); } - if (*result < 0) { + if (*result < 0 && *result != -EOPNOTSUPP) { lderr(cct) << "failed to retrieve group: " << cpp_strerror(*result) << dendl; return m_on_finish; diff --git a/src/test/librbd/image/test_mock_RefreshRequest.cc b/src/test/librbd/image/test_mock_RefreshRequest.cc index b871561e9887f..9e4fea44b3c9e 100644 --- a/src/test/librbd/image/test_mock_RefreshRequest.cc +++ b/src/test/librbd/image/test_mock_RefreshRequest.cc @@ -588,7 +588,7 @@ TEST_F(TestMockImageRefreshRequest, SuccessV2) { expect_get_metadata(mock_image_ctx, mock_get_metadata_request, RBD_INFO, {}, 0); expect_apply_metadata(mock_image_ctx, 0); - expect_get_group(mock_image_ctx, 0); + expect_get_group(mock_image_ctx, -EOPNOTSUPP); expect_refresh_parent_is_required(mock_refresh_parent_request, false); if (ictx->test_features(RBD_FEATURE_EXCLUSIVE_LOCK)) { expect_init_exclusive_lock(mock_image_ctx, mock_exclusive_lock, 0); -- 2.39.5