From: dongdong tao <tdd21151186@gmail.com>
Date: Tue, 9 Jan 2018 08:54:40 +0000 (+0800)
Subject: mds: add error log info
X-Git-Tag: v12.2.3~161^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=61a64511f99c2d8f30ab046fa72e518fba727058;p=ceph.git

mds: add error log info

Signed-off-by: dongdong tao <tdd21151186@gmail.com>
(cherry picked from commit a7c2ecd6391d22c5312a9e568ff742cff252749e)
---

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index fe9a6e9cdaf2..c724a377b5ef 100644
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -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;