]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix Migrator::audit() for IMPORT_ABORTING
authorSage Weil <sage.weil@dreamhost.com>
Sun, 31 Jul 2011 04:21:03 +0000 (21:21 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Mon, 8 Aug 2011 04:27:07 +0000 (21:27 -0700)
Make audit match reality.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/mds/Migrator.cc

index d2ee9d8bffe2fecb1ca5202b782f7d5e0eef7fd2..1e1499b9504570faf1cf471e468dc24d72ff72fd 100644 (file)
@@ -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());