mds: better debugging for scatter_wanted flag

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 6d1374ea39bae874c8601ae352c25831228cd05e..62d18356121488395e4ee8c3223e64e4b74a00f9 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -3524,8 +3524,10 @@ void Locker::scatter_eval(ScatterLock *lock, bool *need_issue)
   assert(lock->get_parent()->is_auth());
   assert(lock->is_stable());
 
-  if (lock->get_parent()->is_freezing_or_frozen())
+  if (lock->get_parent()->is_freezing_or_frozen()) {
+    dout(20) << "  freezing|frozen" << dendl;
     return;
+  }
   
   if (!lock->is_rdlocked() &&
       !lock->is_xlocked() &&
@@ -4318,7 +4320,7 @@ void Locker::handle_file_lock(ScatterLock *lock, MLock *m)
       if (lock->get_state() != LOCK_MIX)  // i.e., the reqscatter didn't race with an actual mix/scatter
        scatter_mix(lock);
     } else {
-      dout(7) << "handle_file_lock ignoring scatter request on " << *lock
+      dout(7) << "handle_file_lock got scatter request, !stable, marking scatter_wanted on " << *lock
              << " on " << *lock->get_parent() << dendl;
       lock->set_scatter_wanted();
     }

diff --git a/src/mds/ScatterLock.h b/src/mds/ScatterLock.h
index 223d316cd5b6559f3283169d92cb0d1f69f43228..d58dc4258fe5b7c55a197f0c3b3744ebdfbfe0c7 100644 (file)
--- a/src/mds/ScatterLock.h
+++ b/src/mds/ScatterLock.h
@@ -181,6 +181,8 @@ public:
       out << " flushing";
     if (is_flushed())
       out << " flushed";
+    if (get_scatter_wanted())
+      out << " scatter_wanted";
     out << ")";
   }
 };