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

mon/OSDMonitor: txsize should be greater or eq to prune_interval - 1 #21430

Merged
merged 1 commit into from Apr 15, 2018

Conversation

tchaikov
Copy link
Contributor

so we can prune 1 or more intervals in a single iteration. and in each
interval, we prune (prune_interval - 1) versions of osdmap.

Signed-off-by: Kefu Chai kchai@redhat.com

@tchaikov
Copy link
Contributor Author

this change addresses error messages like

2018-04-13 20:09:52.377 7f2bfa4d1700 -1 mon.a@0(leader).osd e4704 _prune_sanitize_options'mon_osdmap_full_prune_txsize' (2) <= 'mon_osdmap_full_prune_interval' (2); abort.

see http://pulpito.ceph.com/kchai-2018-04-13_13:51:09-rados-wip-kefu-testing-2018-04-13-1925-distro-basic-mira/2394131/

setting combinations like

        mon osdmap full prune interval: 2
        mon osdmap full prune txsize: 2

should work instead of triggering the errors above.

derr << __func__
<< "'mon_osdmap_full_prune_txsize' (" << txsize
<< ") <= 'mon_osdmap_full_prune_interval' (" << prune_interval
<< ") <= 'mon_osdmap_full_prune_interval-1' (" << prune_interval - 1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

should be "<".

so we can prune 1 or more intervals in a single iteration. and in each
interval, we prune (prune_interval - 1) versions of osdmap.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
Copy link
Contributor Author

changelog

  • s/<=/</

@tchaikov tchaikov merged commit 92ad189 into ceph:master Apr 15, 2018
@tchaikov tchaikov deleted the wip-osdmap-prune branch April 15, 2018 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants