import ceph quincy 17.2.1

[ceph.git] / ceph / src / librbd / cache / pwl / DiscardRequest.cc

diff --git a/ceph/src/librbd/cache/pwl/DiscardRequest.cc b/ceph/src/librbd/cache/pwl/DiscardRequest.cc
index decefafb5277f9bbba4f8cad0ea9aaf7011cfea4..1b537f32d16d9fad216394f81d5b88ada0929fe6 100644 (file)
--- a/ceph/src/librbd/cache/pwl/DiscardRequest.cc
+++ b/ceph/src/librbd/cache/pwl/DiscardRequest.cc
@@ -68,7 +68,13 @@ void DiscardRequest<I>::delete_image_cache_file() {
   if (m_cache_state->present &&
       !m_cache_state->host.compare(ceph_get_short_hostname()) &&
       fs::exists(m_cache_state->path)) {
-    fs::remove(m_cache_state->path);
+    std::error_code ec;
+    fs::remove(m_cache_state->path, ec);
+    if (ec) {
+      lderr(cct) << "failed to remove persistent cache file: " << ec.message()
+                 << dendl;
+      // not fatal
+    }
   }
 
   remove_image_cache_state();
@@ -107,10 +113,6 @@ void DiscardRequest<I>::remove_feature_bit() {
   CephContext *cct = m_image_ctx.cct;
   ldout(cct, 10) << dendl;
 
-  if (!(m_image_ctx.features &&RBD_FEATURE_DIRTY_CACHE)) {
-    finish();
-    return;
-  }
   uint64_t new_features = m_image_ctx.features & ~RBD_FEATURE_DIRTY_CACHE;
   uint64_t features_mask = RBD_FEATURE_DIRTY_CACHE;
   ldout(cct, 10) << "old_features=" << m_image_ctx.features