提交 03c677e1 编写于 作者: S Sage Weil

ceph: reset msgr backoff during open, not after successful handshake

Reset the backoff delay when we reopen the connection, so that the delays
for any initial connection problems are reasonable.  We were resetting only
after a successful handshake, which was of limited utility.
Signed-off-by: NSage Weil <sage@newdream.net>
上级 0dc2570f
...@@ -348,6 +348,7 @@ void ceph_con_open(struct ceph_connection *con, struct ceph_entity_addr *addr) ...@@ -348,6 +348,7 @@ void ceph_con_open(struct ceph_connection *con, struct ceph_entity_addr *addr)
set_bit(OPENING, &con->state); set_bit(OPENING, &con->state);
clear_bit(CLOSED, &con->state); clear_bit(CLOSED, &con->state);
memcpy(&con->peer_addr, addr, sizeof(*addr)); memcpy(&con->peer_addr, addr, sizeof(*addr));
con->delay = 0; /* reset backoff memory */
queue_con(con); queue_con(con);
} }
...@@ -1162,8 +1163,6 @@ static int process_connect(struct ceph_connection *con) ...@@ -1162,8 +1163,6 @@ static int process_connect(struct ceph_connection *con)
con->connect_seq); con->connect_seq);
WARN_ON(con->connect_seq != WARN_ON(con->connect_seq !=
le32_to_cpu(con->in_reply.connect_seq)); le32_to_cpu(con->in_reply.connect_seq));
con->delay = 0; /* reset backoff memory */
prepare_read_tag(con); prepare_read_tag(con);
break; break;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册