]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: add error log info
authordongdong tao <tdd21151186@gmail.com>
Tue, 9 Jan 2018 08:54:40 +0000 (16:54 +0800)
committerdongdong tao <tdd21151186@gmail.com>
Thu, 11 Jan 2018 04:07:51 +0000 (12:07 +0800)
Signed-off-by: dongdong tao <tdd21151186@gmail.com>
src/osdc/Journaler.cc

index 21ce6d410b021aaeece55057896e072637f5bbe3..94ce9cab4031f7fccb7084ad8bea8fd06aaf7b38 100644 (file)
@@ -84,7 +84,11 @@ void Journaler::_set_layout(file_layout_t const *l)
 {
   layout = *l;
 
-  assert(layout.pool_id == pg_pool);
+  if (layout.pool_id != pg_pool) {
+    // user can reset pool id through cephfs-journal-tool
+    lderr(cct) << "may got older pool id from header layout" << dendl;
+    ceph_abort();
+  }
   last_written.layout = layout;
   last_committed.layout = layout;