AsyncMsgr: Fix remote_reset segv

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

diff --git a/src/msg/AsyncConnection.cc b/src/msg/AsyncConnection.cc
index 856dff4c230357257fc8cb3e1f1f36fc6fdf3bd8..6f6715004c40a06ae3b852f612b66901931c46d2 100644 (file)
--- a/src/msg/AsyncConnection.cc
+++ b/src/msg/AsyncConnection.cc
@@ -56,6 +56,17 @@ class C_handle_reset : public EventCallback {
   }
 };
 
+class C_handle_remote_reset : public EventCallback {
+  AsyncMessenger *msgr;
+  AsyncConnectionRef conn;
+
+ public:
+  C_handle_remote_reset(AsyncMessenger *m, AsyncConnectionRef c): msgr(m), conn(c) {}
+  void do_request(int id) {
+    msgr->ms_deliver_handle_remote_reset(conn.get());
+  }
+};
+
 class C_handle_dispatch : public EventCallback {
   AsyncMessenger *msgr;
   Message *m;
@@ -106,6 +117,7 @@ AsyncConnection::AsyncConnection(CephContext *cct, AsyncMessenger *m)
   read_handler.reset(new C_handle_read(this));
   write_handler.reset(new C_handle_write(this));
   reset_handler.reset(new C_handle_reset(async_msgr, this));
+  remote_reset_handler.reset(new C_handle_remote_reset(async_msgr, this));
 }
 
 AsyncConnection::~AsyncConnection()
@@ -1542,7 +1554,7 @@ int AsyncConnection::handle_connect_msg(ceph_msg_connect &connect, bufferlist &a
   int next_state;
 
   if (reply_tag == CEPH_MSGR_TAG_SEQ) {
-    reply_bl.append((char*)existing_seq, sizeof(existing_seq));
+    reply_bl.append((char*)&existing_seq, sizeof(existing_seq));
     next_state = STATE_ACCEPTING_WAIT_SEQ;
   } else {
     next_state = STATE_ACCEPTING_READY;
@@ -1590,13 +1602,14 @@ void AsyncConnection::accept(int incoming)
 
 int AsyncConnection::send_message(Message *m)
 {
+  ldout(async_msgr->cct, 10) << __func__ << dendl;
   m->get_header().src = async_msgr->get_myname();
   if (!m->get_priority())
     m->set_priority(async_msgr->get_default_send_priority());
 
   Mutex::Locker l(lock);
   out_q[m->get_priority()].push_back(m);
-  if (state == STATE_STANDBY && !policy.server) {
+  if ((state == STATE_STANDBY || state == STATE_CLOSED) && !policy.server) {
     _connect();
   } else if (sd > 0 && !open_write) {
     center->create_file_event(sd, EVENT_WRITABLE, write_handler);
@@ -1737,7 +1750,7 @@ void AsyncConnection::was_session_reset()
   discard_out_queue();
   outcoming_bl.clear();
 
-  async_msgr->ms_deliver_handle_remote_reset(this);
+  center->create_time_event(0, remote_reset_handler);
 
   if (randomize_out_seq()) {
     lsubdout(async_msgr->cct,ms,15) << __func__ << " Could not get random bytes to set seq number for session reset; set seq number to " << out_seq << dendl;
@@ -1759,6 +1772,8 @@ void AsyncConnection::_stop()
   shutdown_socket();
   discard_out_queue();
   outcoming_bl.clear();
+  if (policy.lossy)
+    was_session_reset();
   center->delete_file_event(sd, EVENT_READABLE|EVENT_WRITABLE);
   open_write = false;
   state = STATE_CLOSED;

diff --git a/src/msg/AsyncConnection.h b/src/msg/AsyncConnection.h
index d4f8395d535aa736ba1db3bf3f9a670258032f06..842bb56a4aaeb0991aa03105a07e1cefc21f3fe4 100644 (file)
--- a/src/msg/AsyncConnection.h
+++ b/src/msg/AsyncConnection.h
@@ -219,6 +219,7 @@ class AsyncConnection : public Connection {
   EventCallbackRef read_handler;
   EventCallbackRef write_handler;
   EventCallbackRef reset_handler;
+  EventCallbackRef remote_reset_handler;
 
   // Tis section are temp variables used by state transition