dispose session_store on IPC/TCP disconnect request

project-tsurugi · Apr 22, 2024 · f7c1a0b · f7c1a0b
1 parent acf5c38
commit f7c1a0b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/tateyama/endpoint/ipc/bootstrap/ipc_worker.cpp b/src/tateyama/endpoint/ipc/bootstrap/ipc_worker.cpp
@@ -53,6 +53,7 @@ void Worker::do_work() {
             auto h = request_wire_container_->peep();
             if (h.get_length() == 0 && h.get_idx() == tateyama::common::wire::message_header::null_request) {
                 if (request_wire_container_->terminate_requested()) {
+                    dispose_session_store();
                     request_shutdown(tateyama::session::shutdown_request_type::forceful);
                 }
                 care_reqreses();

diff --git a/src/tateyama/endpoint/stream/bootstrap/stream_worker.cpp b/src/tateyama/endpoint/stream/bootstrap/stream_worker.cpp
@@ -117,7 +117,13 @@ void stream_worker::do_work()
             }
             continue;
 
+        case tateyama::endpoint::stream::stream_socket::await_result::termination_request:
+            dispose_session_store();
+            session_stream_->send_session_bye_ok();
+            continue;
+
         default:  // some error
+            dispose_session_store();
             break;
         }
         break;

diff --git a/src/tateyama/endpoint/stream/stream.h b/src/tateyama/endpoint/stream/stream.h
@@ -101,6 +101,11 @@ class stream_socket
          */
         socket_closed,
 
+        /**
+         * @brief the client has sent a request of session close.
+         */
+        termination_request,
+
         /**
          * @brief the message received is in an illegal format.
          */
@@ -137,6 +142,11 @@ class stream_socket
         DVLOG_LP(log_trace) << "<-- RESPONSE_RESULT_SET_BYE " << static_cast<std::uint32_t>(slot);
         send_response(RESPONSE_RESULT_SET_BYE, slot, "");
     }
+    void send_session_bye_ok() {  // for RESPONSE_SESSION_BYE_OK
+        DVLOG_LP(log_trace) << "<-- RESPONSE_SESSION_BYE_OK ";
+        send_response(RESPONSE_SESSION_BYE_OK, 0, "", true);
+    }
+
     void send(std::uint16_t slot, unsigned char writer, std::string_view payload) { // for RESPONSE_RESULT_SET_PAYLOAD
         DVLOG_LP(log_trace) << (payload.length() > 0 ? "<-- RESPONSE_RESULT_SET_PAYLOAD " : "<-- RESPONSE_RESULT_SET_COMMIT ") << static_cast<std::uint32_t>(slot) << ", " << static_cast<std::uint32_t>(writer);
         std::unique_lock<std::mutex> lock(mutex_);
@@ -281,9 +291,7 @@ class stream_socket
                     do {std::unique_lock<std::mutex> lock(mutex_);
                         session_closed_ = true;
                     } while (false);
-                    DVLOG_LP(log_trace) << "<-- RESPONSE_SESSION_BYE_OK ";
-                    send_response(RESPONSE_SESSION_BYE_OK, 0, "", true);
-                    continue;
+                    return await_result::termination_request;
                 }
                 DVLOG_LP(log_trace) << "socket is closed by the client abnormally";
                 return await_result::socket_closed;