librbd: hide ENOENT errors during copyup operations

It's possible for this to occur when shrinking an image with
snapshots and a zeroed data block.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/librbd/CopyupRequest.cc b/src/librbd/CopyupRequest.cc
index c6488b3243eefff51bfa95f55dc424b10ffb3ecb..689c0cfac15f9fadf5ed664d2f3cbe7265550594 100644 (file)
--- a/src/librbd/CopyupRequest.cc
+++ b/src/librbd/CopyupRequest.cc
@@ -237,7 +237,12 @@ private:
       pending_copyups = m_pending_copyups.dec();
       ldout(cct, 20) << "COPYUP (" << pending_copyups << " pending)"
                      << dendl;
-      if (r < 0) {
+      if (r == -ENOENT) {
+        // hide the -ENOENT error if this is the last op
+        if (pending_copyups == 0) {
+          complete_requests(0);
+        }
+      } else if (r < 0) {
         complete_requests(r);
       }
       return (pending_copyups == 0);