Skip to content

Commit

Permalink
ceph: don't set WRITE_PENDING too early
Browse files Browse the repository at this point in the history
prepare_write_connect() prepares a connect message, then sets
WRITE_PENDING on the connection.  Then *after* this, it calls
prepare_connect_authorizer(), which updates the content of the
connection buffer already queued for sending.  It's also possible it
will result in prepare_write_connect() returning -EAGAIN despite the
WRITE_PENDING big getting set.

Fix this by preparing the connect authorizer first, setting the
WRITE_PENDING bit only after that is done.

Partially addresses http://tracker.newdream.net/issues/2424

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
  • Loading branch information
Alex Elder authored and Alex Elder committed May 17, 2012
1 parent e825a66 commit e10c758
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion net/ceph/messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,7 @@ static int prepare_write_connect(struct ceph_connection *con)
{
unsigned global_seq = get_global_seq(con->msgr, 0);
int proto;
int ret;

switch (con->peer_name.type) {
case CEPH_ENTITY_TYPE_MON:
Expand All @@ -723,11 +724,14 @@ static int prepare_write_connect(struct ceph_connection *con)
con->out_connect.flags = 0;

ceph_con_out_kvec_add(con, sizeof (con->out_connect), &con->out_connect);
ret = prepare_connect_authorizer(con);
if (ret)
return ret;

con->out_more = 0;
set_bit(WRITE_PENDING, &con->state);

return prepare_connect_authorizer(con);
return 0;
}

/*
Expand Down

0 comments on commit e10c758

Please sign in to comment.