Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 37 additions & 12 deletions be/src/http/ev_http_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,14 @@ void EvHttpServer::start() {
.set_min_threads(_num_workers)
.set_max_threads(_num_workers)
.build(&_workers));
for (int i = 0; i < _num_workers; ++i) {
auto status = _workers->submit_func([this, i]() {
std::shared_ptr<event_base> base;
{
std::lock_guard lock(_event_bases_lock);
base = _event_bases[i];
}

/* Create a new evhttp object to handle requests. */
std::shared_ptr<evhttp> http(evhttp_new(base.get()),
// Pre-create all evhttp objects and store them as class members
// to ensure proper lifecycle management during shutdown
{
std::lock_guard lock(_event_bases_lock);
_evhttp_servers.resize(_num_workers);
for (int i = 0; i < _num_workers; ++i) {
std::shared_ptr<evhttp> http(evhttp_new(_event_bases[i].get()),
[](evhttp* http) { evhttp_free(http); });
CHECK(http != nullptr) << "Couldn't create an evhttp.";

Expand All @@ -136,22 +134,49 @@ void EvHttpServer::start() {
evhttp_set_newreqcb(http.get(), on_connection, this);
evhttp_set_gencb(http.get(), on_request, this);

_evhttp_servers[i] = http;
}
}

for (int i = 0; i < _num_workers; ++i) {
auto status = _workers->submit_func([this, i]() {
std::shared_ptr<event_base> base;
{
std::lock_guard lock(_event_bases_lock);
base = _event_bases[i];
}
event_base_dispatch(base.get());
});
CHECK(status.ok());
}
}

void EvHttpServer::stop() {
// 1. Close server fd first to reject new connections
close(_server_fd);
_server_fd = -1;

// 2. Break all event loops to make dispatch return
{
std::lock_guard<std::mutex> lock(_event_bases_lock);
for (int i = 0; i < _num_workers; ++i) {
event_base_loopbreak(_event_bases[i].get());
if (_event_bases[i]) {
event_base_loopbreak(_event_bases[i].get());
}
}
}

// 3. Wait for all worker threads to finish event_base_dispatch
_workers->shutdown();
_event_bases.clear();
close(_server_fd);

// 4. Now it's safe to cleanup - all worker threads have exited
// Clear evhttp before event_base since evhttp depends on event_base
{
std::lock_guard<std::mutex> lock(_event_bases_lock);
_evhttp_servers.clear();
_event_bases.clear();
}

_started = false;
}

Expand Down
4 changes: 3 additions & 1 deletion be/src/http/ev_http_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "util/path_trie.hpp"

struct event_base;
struct evhttp;

namespace doris {

Expand Down Expand Up @@ -74,8 +75,9 @@ class EvHttpServer {

int _server_fd = -1;
std::unique_ptr<ThreadPool> _workers;
std::mutex _event_bases_lock; // protect _event_bases
std::mutex _event_bases_lock; // protect _event_bases and _evhttp_servers
std::vector<std::shared_ptr<event_base>> _event_bases;
std::vector<std::shared_ptr<evhttp>> _evhttp_servers;

std::mutex _handler_lock;
PathTrie<HttpHandler*> _get_handlers;
Expand Down
Loading