From a68340e434f49fc57aca43a4925b57179cea4c1e Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 26 Apr 2011 16:46:57 -0700
Subject: [PATCH] mds: ignore resolve messages received prior to resolve stage

Signed-off-by: Sage Weil <sage@newdream.net>
---
 src/mds/MDCache.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 34892509a85c5..e5915ca293f45 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -2561,6 +2561,12 @@ void MDCache::handle_resolve(MMDSResolve *m)
   dout(7) << "handle_resolve from " << m->get_source() << dendl;
   int from = m->get_source().num();
 
+  if (mds->get_state() < MDSMap::STATE_RESOLVE) {
+    // wait until we reach the resolve stage!
+    m->put();
+    return;
+  }
+
   // ambiguous slave requests?
   if (!m->slave_requests.empty()) {
     MMDSResolveAck *ack = new MMDSResolveAck;
-- 
2.39.5