cephfs-journal-tool: get and check layout info during dump/undump #22211
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ukernel
approved these changes
Jun 7, 2018
|
retest this please |
|
Please create a tracker issue so that this issue can be tracked for backporting. Then, please annotate the commit which fixes/resolves a Ceph tracker issue with:
This is essential when examining the history of the repository (this commit fixes what) and helps merge scripts identify issues that have been resolved by a merge. |
guzhongyan
force-pushed
the
fstool-layout
branch
from
c731f18
to
86bb2e7
Compare
|
@batrick tracker issue created. commit updated. please review. |
batrick
requested changes
Jun 25, 2018
src/tools/cephfs/Dumper.cc
Outdated
| snprintf(buf, HEADER_LEN, "Ceph mds%d journal dump\n start offset %llu (0x%llx)\n\ | ||
| length %llu (0x%llx)\n write_pos %llu (0x%llx)\n format %llu\n\ | ||
| trimmed_pos %llu (0x%llx)\n stripe_unit %lu (0x%lx)\n stripe_count %lu (0x%lx)\n\ | ||
| object_size %lu (0x%lx)\n fsid %s\n%c", |
There was a problem hiding this comment.
fsid left in from other PR. This causes a seg-fault:
(gdb) bt
#0 0x00007f4e6a3cb269 in raise (sig=sig@entry=11) at ../sysdeps/unix/sysv/linux/pt-raise.c:35
#1 0x000055b7f691d9b3 in reraise_fatal (signum=11) at /build/ceph-14.0.0-787-g8f48616/src/global/signal_handler.cc:80
#2 handle_fatal_signal (signum=11) at /build/ceph-14.0.0-787-g8f48616/src/global/signal_handler.cc:290
#3 <signal handler called>
#4 0x00007f4e69929cc0 in _IO_vfprintf_internal (s=s@entry=0x7fffd3b87d50, format=<optimized out>,
format@entry=0x55b7f6946008 "Ceph mds%d journal dump\n start offset %llu (0x%llx)\n length %llu (0x%llx)\n write_pos %llu (0x%llx)\n format %llu\n trimmed_pos %llu (0x%llx)\n stripe_unit %lu (0x%lx)\n stripe_count %"..., ap=ap@entry=0x7fffd3b87ec8) at vfprintf.c:1632
#5 0x00007f4e699f1896 in ___vsnprintf_chk (
s=0x7fffd3b88770 "Ceph mds0 journal dump\n start offset 4194304 (0x400000)\n length 31179 (0x79cb)\n write_pos 4221504 (0x406a40)\n format 1\n trimmed_pos 4194304 (0x400000)\n stripe_unit 4194304 (0x400000)"..., maxlen=<optimized out>, flags=1, slen=<optimized out>,
format=0x55b7f6946008 "Ceph mds%d journal dump\n start offset %llu (0x%llx)\n length %llu (0x%llx)\n write_pos %llu (0x%llx)\n format %llu\n trimmed_pos %llu (0x%llx)\n stripe_unit %lu (0x%lx)\n stripe_count %"..., args=args@entry=0x7fffd3b87ec8) at vsnprintf_chk.c:63
#6 0x00007f4e699f17f8 in ___snprintf_chk (
s=s@entry=0x7fffd3b88770 "Ceph mds0 journal dump\n start offset 4194304 (0x400000)\n length 31179 (0x79cb)\n write_pos 4221504 (0x406a40)\n format 1\n trimmed_pos 4194304 (0x400000)\n stripe_unit 4194304 (0x400000)"..., maxlen=maxlen@entry=4096, flags=flags@entry=1, slen=slen@entry=4096,
format=format@entry=0x55b7f6946008 "Ceph mds%d journal dump\n start offset %llu (0x%llx)\n length %llu (0x%llx)\n write_pos %llu (0x%llx)\n format %llu\n trimmed_pos %llu (0x%llx)\n stripe_unit %lu (0x%lx)\n stripe_count %"...) at snprintf_chk.c:34
#7 0x000055b7f65ddac0 in snprintf (
__fmt=0x55b7f6946008 "Ceph mds%d journal dump\n start offset %llu (0x%llx)\n length %llu (0x%llx)\n write_pos %llu (0x%llx)\n format %llu\n trimmed_pos %llu (0x%llx)\n stripe_unit %lu (0x%lx)\n stripe_count %"..., __n=4096,
__s=0x7fffd3b88770 "Ceph mds0 journal dump\n start offset 4194304 (0x400000)\n length 31179 (0x79cb)\n write_pos 4221504 (0x406a40)\n format 1\n trimmed_pos 4194304 (0x400000)\n stripe_unit 4194304 (0x400000)"...) at /usr/include/x86_64-linux-gnu/bits/stdio2.h:65
#8 Dumper::dump (this=this@entry=0x7fffd3b89980, dump_file=0x55b7f8934180 "/tmp/journal.bin") at /build/ceph-14.0.0-787-g8f48616/src/tools/cephfs/Dumper.cc:111
#9 0x000055b7f65c1c25 in JournalTool::journal_export (this=this@entry=0x7fffd3b89e40, path="/tmp/journal.bin", import=<optimized out>) at /build/ceph-14.0.0-787-g8f48616/src/tools/cephfs/JournalTool.cc:589
#10 0x000055b7f65c226b in JournalTool::main_journal (this=this@entry=0x7fffd3b89e40, argv=std::vector of length 2, capacity 3 = {...}) at /build/ceph-14.0.0-787-g8f48616/src/tools/cephfs/JournalTool.cc:207
#11 0x000055b7f65ba522 in JournalTool::main (this=0x7fffd3b89e40, argv=std::vector of length 2, capacity 3 = {...}) at /build/ceph-14.0.0-787-g8f48616/src/tools/cephfs/JournalTool.cc:168
#12 0x000055b7f65b97b6 in main (argc=<optimized out>, argv=<optimized out>) at /build/ceph-14.0.0-787-g8f48616/src/tools/cephfs/cephfs-journal-tool.cc:51
There was a problem hiding this comment.
@batrick should I combine this pr with the fsid-introduced pr as a single pr to avoid the isssue. they touched the same file same function.
There was a problem hiding this comment.
This can wait until the fsid PR goes in.
when cephfs-journal-tool import journal, it uses default layout to get object_size, this is wrong. Because default objetct_size can be changed by Config option change mds_log_segment_size when cluster initialized. The fix is save the layout info to header during journal export, When improt journal, first try to get layout from cluster, if failed, then get layout info from dumped journal file, if still failed, set layout to default. Fixes: http://tracker.ceph.com/issues/24644 Signed-off-by: Gu Zhongyan <guzhongyan@360.cn> Signed-off-by: yupeng chen chenyupeng-it@360.cn
|
@batrick , rebased, please take a look. |
batrick
approved these changes
Jul 10, 2018
wjwithagen
pushed a commit
to wjwithagen/ceph
that referenced
this pull request
Jul 15, 2018
* refs/pull/22211/head: cephfs-journal-tool: get and check layout info during dump/undump Reviewed-by: Patrick Donnelly <pdonnell@redhat.com> Reviewed-by: Zheng Yan <zyan@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
when cephfs-journal-tool import journal, it uses default layout
to get object_size, this is wrong. Because default objetct_size
can be changed by Config option change mds_log_segment_size when
cluster initialized.
The fix is save the layout info to header during journal export,
When improt journal, first try to get layout from cluster, if failed,
then get layout info from dumped journal file, if still failed, set
layout to default.
Signed-off-by: Gu Zhongyan guzhongyan@360.cn
Signed-off-by: yupeng chen chenyupeng-it@360.cn