msg/async/ProtocolV2: do not reenable pre_auth buffering on from reset_recv_state #26965
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
also reenable pre_auth around line 370 (https://github.com/ceph/ceph/pull/26965/files#diff-ea445419e9f7f9529b73ce454e5e3c53R370)? |
…t_recv_state This is specifically bad because we call reset_recv_state from reuse_connection, which turns buffering back on on an already-authenticated session. Instead, reenable it only when we set the state to START_CONNECT. (On the accepting side, it is a fresh connection, so it starts out true.) Also, we want to *disable* it on the connection we are reusing, which might be in a pre-auth state, while we are in a post-auth state. Fixes: http://tracker.ceph.com/issues/38746 Signed-off-by: Sage Weil <sage@redhat.com>
|
updated |
rjfd
reviewed
Mar 15, 2019
| @@ -2626,6 +2628,7 @@ CtPtr ProtocolV2::reuse_connection(AsyncConnectionRef existing, | |||
| ceph_assert(!connection->delay_state); | |||
| } | |||
| exproto->reset_recv_state(); | |||
| exproto->pre_auth.enabled = false; | |||
There was a problem hiding this comment.
also add exproto->pre_auth.rxbuf.clear(); below this line
There was a problem hiding this comment.
that is already done by the reset_recv_state, right?
There was a problem hiding this comment.
you're right, disregard this comment
…et big Signed-off-by: Sage Weil <sage@redhat.com>
liewegas
added a commit
that referenced
this pull request
Mar 15, 2019
* refs/pull/26965/head: ms/async/ProtocolV2: add ms_die_on_bug and assert rxbuf/txbuf don't get big msg/async/ProtocolV2: do not reenable pre_auth buffering on from reset_recv_state Reviewed-by: Ricardo Dias <rdias@suse.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is specifically bad because we call reset_recv_state from
reuse_connection, which turns buffering back on on an already-authenticated
session.
Instead, reenable it only when we set the state to START_CONNECT. (On
the accepting side, it is a fresh connection, so it starts out true.)
Fixes: http://tracker.ceph.com/issues/38746
Signed-off-by: Sage Weil sage@redhat.com