Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.2 -> 4.0] change HTTP code on exceedinghttp-max-bytes-in-flight-mb or http-max-in-flight-requests to 503 #2205

Merged
merged 3 commits into from
Feb 5, 2024
Merged

[3.2 -> 4.0] change HTTP code on exceedinghttp-max-bytes-in-flight-mb or http-max-in-flight-requests to 503 #2205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a82f152
change max inflight bytes/requests from 429 to 503
spoonincode Feb 5, 2024
5b0eba2
Merge pull request #2199 from AntelopeIO/http_max_429to503_32
spoonincode Feb 5, 2024
8a0388f
Merge remote-tracking branch 'origin/release/3.2' into HEAD
spoonincode Feb 5, 2024
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
4 changes: 2 additions & 2 deletions plugins/http_plugin/http_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ namespace eosio {
("max-body-size", bpo::value<uint32_t>()->default_value(my->plugin_state->max_body_size),
"The maximum body size in bytes allowed for incoming RPC requests")
("http-max-bytes-in-flight-mb", bpo::value<int64_t>()->default_value(500),
"Maximum size in megabytes http_plugin should use for processing http requests. -1 for unlimited. 429 error response when exceeded." )
"Maximum size in megabytes http_plugin should use for processing http requests. -1 for unlimited. 503 error response when exceeded." )
("http-max-in-flight-requests", bpo::value<int32_t>()->default_value(-1),
"Maximum number of requests http_plugin should use for processing http requests. 429 error response when exceeded." )
"Maximum number of requests http_plugin should use for processing http requests. 503 error response when exceeded." )
("http-max-response-time-ms", bpo::value<int64_t>()->default_value(30),
"Maximum time for processing a request, -1 for unlimited")
("verbose-http-errors", bpo::bool_switch()->default_value(false),
Expand Down
10 changes: 5 additions & 5 deletions plugins/http_plugin/include/eosio/http_plugin/beast_http_session.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,18 +237,18 @@ class beast_http_session : public detail::abstract_conn {

virtual void send_busy_response(std::string&& what) final {
error_results::error_info ei;
ei.code = static_cast<int64_t>(http::status::too_many_requests);
ei.code = static_cast<int64_t>(http::status::service_unavailable);
ei.name = "Busy";
ei.what = std::move(what);
error_results results{static_cast<uint16_t>(http::status::too_many_requests), "Busy", ei};
error_results results{static_cast<uint16_t>(http::status::service_unavailable), "Busy", ei};
send_response(fc::json::to_string(results, fc::time_point::maximum()),
static_cast<unsigned int>(http::status::too_many_requests) );
static_cast<unsigned int>(http::status::service_unavailable) );
}

virtual std::string verify_max_bytes_in_flight(size_t extra_bytes) final {
auto bytes_in_flight_size = plugin_state_->bytes_in_flight.load() + extra_bytes;
if(bytes_in_flight_size > plugin_state_->max_bytes_in_flight) {
fc_dlog(plugin_state_->logger, "429 - too many bytes in flight: ${bytes}", ("bytes", bytes_in_flight_size));
fc_dlog(plugin_state_->logger, "503 - too many bytes in flight: ${bytes}", ("bytes", bytes_in_flight_size));
return "Too many bytes in flight: " + std::to_string( bytes_in_flight_size );
}
return {};
Expand All @@ -260,7 +260,7 @@ class beast_http_session : public detail::abstract_conn {

auto requests_in_flight_num = plugin_state_->requests_in_flight.load();
if(requests_in_flight_num > plugin_state_->max_requests_in_flight) {
fc_dlog(plugin_state_->logger, "429 - too many requests in flight: ${requests}", ("requests", requests_in_flight_num));
fc_dlog(plugin_state_->logger, "503 - too many requests in flight: ${requests}", ("requests", requests_in_flight_num));
return "Too many requests in flight: " + std::to_string( requests_in_flight_num );
}
return {};
Expand Down
Loading