]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix assertion on HB during suicide
authorJohn Spray <john.spray@redhat.com>
Mon, 16 Feb 2015 10:52:56 +0000 (10:52 +0000)
committerJohn Spray <john.spray@redhat.com>
Tue, 17 Feb 2015 14:23:22 +0000 (14:23 +0000)
Was checking 'state', should have been
checking 'want_state'.

Signed-off-by: John Spray <john.spray@redhat.com>
src/mds/MDS.cc

index f9d7ae6e7f4663b4bd11dc232e62786abfb4b6de..d2788a94905eed64494949ede74d18220512af9b 100644 (file)
@@ -3013,7 +3013,7 @@ void MDS::heartbeat_reset()
   // after a call to suicide() completes, in which case MDS::hb
   // has been freed and we are a no-op.
   if (!hb) {
-      assert(state == CEPH_MDS_STATE_DNE);
+      assert(want_state == CEPH_MDS_STATE_DNE);
       return;
   }