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

mgr: fix MgrStandby eating messages #15716

Merged
merged 1 commit into from Jun 17, 2017

Conversation

Projects
None yet
3 participants
@jcsp
Contributor

jcsp commented Jun 15, 2017

It was failing to pass up the Mgr::ms_dispatch
return value, so messages were being consumed
even if Mgr was returning false. Mgr returns
false to enable Client to see FSMap, so the
symptom was the Client not working.

While we're here, refactor switch into if, because
there were only two paths in the switch and we
don't expect to be adding more.

Signed-off-by: John Spray john.spray@redhat.com

@jcsp jcsp added bug fix mgr labels Jun 15, 2017

@jcsp jcsp requested a review from tchaikov Jun 15, 2017

@liewegas

otherwise lgtm

lock.Unlock();
bool handled = am->ms_dispatch(m);
lock.Lock();
return handled;

This comment has been minimized.

@liewegas

liewegas Jun 15, 2017

Member

indentation?

This comment has been minimized.

@jcsp

jcsp Jun 15, 2017

Contributor

Fixed -- in my defense, I wrote it in the back of a car :-)

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

mgr: fix MgrStandby eating messages
It was failing to pass up the Mgr::ms_dispatch
return value, so messages were being consumed
even if Mgr was returning false.  Mgr returns
false to enable Client to see FSMap, so the
symptom was the Client not working.

While we're here, refactor switch into if, because
there were only two paths in the switch and we
don't expect to be adding more.

Signed-off-by: John Spray <john.spray@redhat.com>
@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Jun 16, 2017

terminate called after throwing an instance of 'std::runtime_error'
  what():  failed to decode
terminate called after throwing an instance of 'std::runtime_error'
  what():  failed to decode
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/encoding/readable.sh: line 104:  4162 Aborted                 (core dumped) $CEPH_DENCODER type $type import $vdir/objects/$type/$f decode dump_json > $tmp1
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/encoding/readable.sh: line 104:  4163 Aborted                 (core dumped) $CEPH_DENCODER type $type import $vdir/objects/$type/$f decode encode decode dump_json > $tmp2
**** failed to decode /home/jenkins-build/build/workspace/ceph-pull-requests/ceph-object-corpus/archive/0.80-rc1-35-g4812150/objects/MMDSSlaveRequest/e741e9175f555c9e7176f59137edbfac ****

retest this please

@liewegas

This comment has been minimized.

Member

liewegas commented Jun 16, 2017

retest this please

@liewegas

This comment has been minimized.

Member

liewegas commented Jun 16, 2017

http://pulpito.ceph.com/sage-2017-06-16_18:45:23-rados-wip-sage-testing-distro-basic-smithi/

was a bit inconclusive about mgr stat updates.. going to run this through qa again!

@liewegas liewegas merged commit 6856fe7 into ceph:master Jun 17, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
arm64 make check arm64 make check succeeded
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment