From: Sage Weil <sage.weil@dreamhost.com>
Date: Sun, 31 Jul 2011 04:21:03 +0000 (-0700)
Subject: mds: fix Migrator::audit() for IMPORT_ABORTING
X-Git-Tag: v0.33~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=857f2adc38014ed8d7bd512a485fa1eb80cfc4c0;p=ceph.git

mds: fix Migrator::audit() for IMPORT_ABORTING

Make audit match reality.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index d2ee9d8bffe2..1e1499b95045 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -514,6 +514,11 @@ void Migrator::audit()
     assert(dir);
     if (p->second == IMPORT_PREPPING) 
       continue;
+    if (p->second == IMPORT_ABORTING) {
+      assert(!dir->is_ambiguous_dir_auth());
+      assert(dir->get_dir_auth().first != mds->get_nodeid());
+      continue;
+    }
     assert(dir->is_ambiguous_dir_auth());
     assert(dir->authority().first  == mds->get_nodeid() ||
 	   dir->authority().second == mds->get_nodeid());