mds: fix file recovery

Make state bits distinct.  Duh.

Also, if an inode is queued for recovery, and doesn't need it later, unqueue it
(clear the bit, drop auth pin).

diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index e55d0081d7aeebd4cfe4b194e2fa3e159a62d7fc..901ddb89546c762420852a3615584be0bdd7fffd 100644 (file)
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -105,7 +105,7 @@ class CInode : public MDSCacheObject {
   static const int STATE_AMBIGUOUSAUTH = (1<<9);
   static const int STATE_EXPORTINGCAPS = (1<<10);
   static const int STATE_NEEDSRECOVER = (1<<11);
-  static const int STATE_RECOVERING = (1<<11);
+  static const int STATE_RECOVERING =   (1<<12);
 
   // -- waiters --
   static const __u64 WAIT_DIR         = (1<<0);

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index db9d54009975a46d508510da76e99f49c6ed7a3a..5fd112744dc8613692ce241e8b63a3948d2ea17f 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -3980,6 +3980,9 @@ void MDCache::do_file_recover()
     } else {
       dout(10) << "do_file_recover skipping " << in->inode.size << "/" << in->inode.max_size 
               << " " << *in << dendl;
+      in->state_clear(CInode::STATE_NEEDSRECOVER);
+      in->auth_unpin(this);
+      mds->locker->file_eval_gather(&in->filelock);
     }
   }
 }