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/PGMap: fix osd_epoch update when removing osd_stat #15573

Merged
merged 2 commits into from Jun 9, 2017

Conversation

Projects
None yet
4 participants
@liewegas
Member

liewegas commented Jun 8, 2017

Fixes: http://tracker.ceph.com/issues/20208 (one instance of it at least)

liewegas added some commits Jun 7, 2017

mgr/ClusterState: dump pgmap and inc at dout 30
Signed-off-by: Sage Weil <sage@redhat.com>
mon/PGMap: erase osd_epochs entry too when we erase osd_stat entry
Signed-off-by: Sage Weil <sage@redhat.com>

@liewegas liewegas requested a review from tchaikov Jun 8, 2017

@ghost ghost requested a review from Jun 8, 2017

@ghost

ghost approved these changes Jun 8, 2017

Tested manually.

@liewegas liewegas added the needs-qa label Jun 8, 2017

@ghost

This comment has been minimized.

ghost commented Jun 8, 2017

FWIW, passed ceph-disk suite at #15576 (comment) (with a minor ceph-disk fix)

@ghost ghost referenced this pull request Jun 9, 2017

Merged

ceph-disk: support osd new #15432

@yuriw yuriw merged commit b38272a into ceph:master Jun 9, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details
@@ -1130,6 +1130,7 @@ void PGMap::apply_incremental(CephContext *cct, const Incremental& inc)
if (t != osd_stat.end()) {
stat_osd_sub(t->first, t->second);
osd_stat.erase(t);
osd_epochs.erase(*p);

This comment has been minimized.

@Liuchang0812

Liuchang0812 Jun 12, 2017

Contributor

Jenkins is broken at flush_pg_status always. is it relevant?

@ghost

This comment has been minimized.

ghost commented Jun 12, 2017

https://jenkins.ceph.com/job/ceph-pull-requests/25879/console also: I suspect this is in master actually.

@Liuchang0812

This comment has been minimized.

Contributor

Liuchang0812 commented Jun 12, 2017

@dachary you are right. make check with master is failed.

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