From: John Spray <john.spray@redhat.com>
Date: Thu, 19 Mar 2015 13:24:11 +0000 (+0000)
Subject: mds: call damaged() on errors loading SessionMap
X-Git-Tag: v9.0.0~113^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=777fd88b42723394e996ad758aee5337aad7f726;p=ceph.git

mds: call damaged() on errors loading SessionMap

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc
index 6651ac76e72a..3fcbb6ee52b4 100644
--- a/src/mds/SessionMap.cc
+++ b/src/mds/SessionMap.cc
@@ -142,14 +142,21 @@ void SessionMap::_load_finish(
 {
   if (operation_r < 0) {
     derr << "_load_finish got " << cpp_strerror(operation_r) << dendl;
-    assert(0 == "failed to load sessionmap");
+    mds->clog->error() << "error reading sessionmap '" << get_object_name()
+                       << "' " << operation_r << " ("
+                       << cpp_strerror(operation_r) << ")";
+    mds->damaged();
+    assert(0);  // Should be unreachable because damaged() calls respawn()
   }
 
   // Decode header
   if (first) {
     if (header_r != 0) {
       derr << __func__ << ": header error: " << cpp_strerror(header_r) << dendl;
-      assert(0 == "error reading header!");
+      mds->clog->error() << "error reading sessionmap header "
+                         << header_r << " (" << cpp_strerror(header_r) << ")";
+      mds->damaged();
+      assert(0);  // Should be unreachable because damaged() calls respawn()
     }
 
     if(header_bl.length() == 0) {
@@ -158,18 +165,33 @@ void SessionMap::_load_finish(
       return;
     }
 
-    decode_header(header_bl);
+    try {
+      decode_header(header_bl);
+    } catch (buffer::error &e) {
+      mds->clog->error() << "corrupt sessionmap header: " << e.what();
+      mds->damaged();
+      assert(0);  // Should be unreachable because damaged() calls respawn()
+    }
     dout(10) << __func__ << " loaded version " << version << dendl;
   }
 
   if (values_r != 0) {
     derr << __func__ << ": error reading values: "
       << cpp_strerror(values_r) << dendl;
-    assert(0 == "error reading values");
+    mds->clog->error() << "error reading sessionmap values: " 
+                       << values_r << " (" << cpp_strerror(values_r) << ")";
+    mds->damaged();
+    assert(0);  // Should be unreachable because damaged() calls respawn()
   }
 
   // Decode session_vals
-  decode_values(session_vals);
+  try {
+    decode_values(session_vals);
+  } catch (buffer::error &e) {
+    mds->clog->error() << "corrupt sessionmap values: " << e.what();
+    mds->damaged();
+    assert(0);  // Should be unreachable because damaged() calls respawn()
+  }
 
   if (session_vals.size() == g_conf->mds_sessionmap_keys_per_op) {
     // Issue another read if we're not at the end of the omap