Skip to content
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

mds: don't report repaired backtraces in damagetable, write back after repair, clean up scrub log #18538

Merged
merged 4 commits into from
Nov 3, 2017

Conversation

jcsp
Copy link
Contributor

@jcsp jcsp commented Oct 25, 2017

@jcsp jcsp added bug-fix cephfs Ceph File System labels Oct 25, 2017
@jcsp jcsp requested review from batrick and ukernel October 25, 2017 13:50
Copy link
Member

@batrick batrick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise looks great. Thanks John!

<< " (" << path << ") see " << g_conf->name
<< " log and `damage ls` output for details";
if (result.all_damage_repaired()) {
clog->warn() << "Scrub repaired inode " << in->ino()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From your fourth commit message "If we've repaired then we don't need to be at WRN", I got the impression this should be clog->info?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch, pushed an update.

John Spray added 4 commits October 31, 2017 16:37
People often are not using a tag with their scrub,
let's not have the ugly "with tag ''" in that case.

Signed-off-by: John Spray <john.spray@redhat.com>
Fixes: http://tracker.ceph.com/issues/18743
Signed-off-by: John Spray <john.spray@redhat.com>
Otherwise, if we restart the MDS right after the scrub,
then scrub again, it will see the same inconsistency when
it looks at the on-disk state.

This involves adapting the use of ScrubHeader to be something
writeable during scrub to record whether repair happened.

Signed-off-by: John Spray <john.spray@redhat.com>
If we've repaired then we don't need to be at WRN
and we don't need to advise the user to look up
the damage detail.

Signed-off-by: John Spray <john.spray@redhat.com>
@batrick batrick merged commit 3160ef2 into ceph:master Nov 3, 2017
batrick added a commit that referenced this pull request Nov 3, 2017
* refs/pull/18538/head:
	mds: clean up clog damage message when repairing
	mds: flush after scrub repairs
	mds: don't report repaired backtraces in damagetable
	mds: cleaner scrub complete log msg

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants