update sources to v12.1.0

[ceph.git] / ceph / src / librbd / Journal.cc

diff --git a/ceph/src/librbd/Journal.cc b/ceph/src/librbd/Journal.cc
index c19a6a80c50022f9b218f3a2e9625d5024052c32..aa73cdeddac73c45ffd15307a5c5430694aca329 100644 (file)
--- a/ceph/src/librbd/Journal.cc
+++ b/ceph/src/librbd/Journal.cc
@@ -1332,9 +1332,11 @@ void Journal<I>::handle_replay_process_safe(ReplayEntry replay_entry, int r) {
 
   ldout(cct, 20) << this << " " << __func__ << ": r=" << r << dendl;
   if (r < 0) {
-    lderr(cct) << this << " " << __func__ << ": "
-               << "failed to commit journal event to disk: " << cpp_strerror(r)
-               << dendl;
+    if (r != -ECANCELED) {
+      lderr(cct) << this << " " << __func__ << ": "
+                 << "failed to commit journal event to disk: "
+                 << cpp_strerror(r) << dendl;
+    }
 
     if (m_state == STATE_REPLAYING) {
       // abort the replay if we have an error