New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

luminous: cephfs: cephfs-journal-tool: wrong layout info used #24033

Merged
merged 2 commits into from Sep 18, 2018

Conversation

Projects
None yet
4 participants
@smithfarm
Contributor

smithfarm commented Sep 11, 2018

guzhongyan added some commits May 21, 2018

cephfs-journal-tool: check fsid when import purge queue
import purge queue will triger file delete in cluster.
we occasionally imported a purge queue from one production
cluster to a test cluster and found the the fs in test cluster
was damaged because some objects are really delted as its inode
recorded in purge queue.

add fsid when exporting purge queue, check if the fsid matched when
importing purge queue. This could make cephfs-journal-tool safer to
handle purge queue issues.

Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
Signed-off-by: yupeng chen chenyupeng-it@360.cn
(cherry picked from commit e0eef2a)
cephfs-journal-tool: get and check layout info during dump/undump
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
(cherry picked from commit 989ecf2)
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Sep 11, 2018

test this please

@yuriw

This comment has been minimized.

Contributor

yuriw commented Sep 13, 2018

@yuriw yuriw merged commit e69fe07 into ceph:luminous Sep 18, 2018

4 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details

@smithfarm smithfarm deleted the smithfarm:wip-24934-luminous branch Sep 24, 2018

@smithfarm smithfarm changed the title from luminous: cephfs-journal-tool: wrong layout info used to luminous: cephfs: cephfs-journal-tool: wrong layout info used Oct 26, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment