]> 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)
committerPrashant D <pdhange@redhat.com>
Wed, 24 Jan 2018 01:19:56 +0000 (20:19 -0500)
Signed-off-by: dongdong tao <tdd21151186@gmail.com>
(cherry picked from commit a7c2ecd6391d22c5312a9e568ff742cff252749e)

src/osdc/Journaler.cc

index fe9a6e9cdaf2b043942406e543ea9716fb3cf7fb..c724a377b5efbb1ce5b9e0421f27209e59dc2b25 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;