os/filestore/FileJournal: note EIO events

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 614fb4631a8909d97ea82ae657361017816b6a65)

diff --git a/src/os/filestore/FileJournal.cc b/src/os/filestore/FileJournal.cc
index 2083b0a0a421e04e86eea145f8a5d88fe7478a54..f0351fe46273a217bf86343903064bd535e68c77 100644 (file)
--- a/src/os/filestore/FileJournal.cc
+++ b/src/os/filestore/FileJournal.cc
@@ -1459,6 +1459,9 @@ void FileJournal::write_finish_thread_entry()
        continue;
       }
       derr << "io_getevents got " << cpp_strerror(r) << dendl;
+      if (r == -EIO) {
+       note_io_error_event(devname.c_str(), fn.c_str(), -EIO, 0, 0, 0);
+      }
       ceph_abort_msg("got unexpected error from io_getevents");
     }
 
@@ -2208,5 +2211,6 @@ void FileJournal::collect_metadata(map<string,string> *pm)
     (*pm)["backend_filestore_journal_dev_node"] = "unknown";
   } else {
     (*pm)["backend_filestore_journal_dev_node"] = string(dev_node);
+    devname = dev_node;
   }
 }

diff --git a/src/os/filestore/FileJournal.h b/src/os/filestore/FileJournal.h
index 23ca024d65b2608172d282ef7007481ce555cdb1..2313b4b8d0cc4bc9f74d3cb19bd1fa20573f1b16 100644 (file)
--- a/src/os/filestore/FileJournal.h
+++ b/src/os/filestore/FileJournal.h
@@ -283,6 +283,8 @@ private:
   uint64_t last_committed_seq;
   uint64_t journaled_since_start;
 
+  string devname;
+
   /*
    * full states cycle at the beginnging of each commit epoch, when commit_start()
    * is called.