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

Jump to bottom

HTTP: Warning and test fix #943

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
+42 −2
Open

HTTP: Warning and test fix #943

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dc3eaad
Fix warning
heifner Oct 16, 2024
d507054
Update test for slow connections
heifner Oct 16, 2024
cfae058
Use f instead of r to be less confusing
heifner Oct 16, 2024
5ceda4c
Add verification that bytes_in_flight is 0
heifner Oct 16, 2024
995da77
Remove unneeded wait()s
heifner Oct 16, 2024
e8de934
Add a requests_in_flight and verify in test
heifner Oct 16, 2024
98db2f4
Add back original sleep
heifner Oct 17, 2024
f35f6f0
Replace sleep with a loop that waits for number of requests to be queued
heifner Oct 18, 2024
2b43faf
Fix while logic
heifner Oct 19, 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: 4 additions & 0 deletions plugins/http_plugin/http_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,10 @@ namespace eosio {
my->plugin_state->update_metrics = std::move(fun);
}

size_t http_plugin::bytes_in_flight() const {
return my->plugin_state->bytes_in_flight;
}

std::atomic<bool>& http_plugin::listening() {
return my->listening;
}
Expand Down
2 changes: 2 additions & 0 deletions plugins/http_plugin/include/eosio/http_plugin/http_plugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ namespace eosio {

void register_update_metrics(std::function<void(metrics)>&& fun);

size_t bytes_in_flight() const;

std::atomic<bool>& listening();
private:
std::shared_ptr<class http_plugin_impl> my;
Expand Down
22 changes: 18 additions & 4 deletions plugins/http_plugin/tests/unit_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,10 +604,9 @@ BOOST_FIXTURE_TEST_CASE(bytes_in_flight, http_plugin_test_fixture) {
boost::beast::http::request<boost::beast::http::empty_body> req(boost::beast::http::verb::get, "/4megabyte", 11);
req.keep_alive(true);
req.set(http::field::host, "127.0.0.1:8891");
s.wait(boost::asio::ip::tcp::socket::wait_write);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of this and the wait_read below? Why would the socket not be writable here? And if it isn't writable why does it matter before a sync write is issued?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed. I'll remove.

boost::beast::http::write(s, req);
}
//make sure got to the point http threads had responses queued
std::this_thread::sleep_for(std::chrono::seconds(5));
};

auto drain_http_replies = [&](unsigned max = std::numeric_limits<unsigned>::max()) {
Expand All @@ -624,6 +623,12 @@ BOOST_FIXTURE_TEST_CASE(bytes_in_flight, http_plugin_test_fixture) {
return count_of_status_replies;
};

auto wait_for_no_bytes_in_flight = [&](uint16_t max = std::numeric_limits<uint16_t>::max()) {
greg7mdp marked this conversation as resolved.
Show resolved Hide resolved
while (http_plugin->bytes_in_flight() > 0 && --max)
std::this_thread::sleep_for(std::chrono::milliseconds(5));
BOOST_CHECK(max > 0);
};


//send a single request to start with
send_4mb_requests(1u);
Expand All @@ -646,6 +651,7 @@ BOOST_FIXTURE_TEST_CASE(bytes_in_flight, http_plugin_test_fixture) {
send_4mb_requests(32u);
//now rip these connections out before the responses are completely sent
connections.clear();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understood your description right, this is the area that is problematic. Between this line and the line below the http plugin needs to have cleaned up all its ownstanding async_writes. Just closing the socket here does indeed send the FIN but the http threads need time to wake up and handle that error on the async_write to then clear out what's in flight.

I wonder if what might work is to shutdown each connection and then async_read on each one until getting confirmation the remote side disconnected via an error code.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would likely work. I added a check for bytes_in_flight since that is really what we want to test anyway. We want to verify that bytes in flight goes to 0 once connections are closed.

wait_for_no_bytes_in_flight();
//send some requests that should work still
send_4mb_requests(8u);
r = drain_http_replies();
Expand Down Expand Up @@ -680,15 +686,14 @@ BOOST_FIXTURE_TEST_CASE(requests_in_flight, http_plugin_test_fixture) {
req.set(http::field::host, "127.0.0.1:8892");
boost::beast::http::write(s, req);
}
//make sure got to the point http threads had responses queued
std::this_thread::sleep_for(std::chrono::seconds(1));
};

auto scan_http_replies = [&]() {
std::unordered_map<boost::beast::http::status, size_t> count_of_status_replies;
for(boost::asio::ip::tcp::socket& c : connections) {
boost::beast::http::response<boost::beast::http::string_body> resp;
boost::beast::flat_buffer buffer;
c.wait(boost::asio::ip::tcp::socket::wait_read);
boost::beast::http::read(c, buffer, resp);

count_of_status_replies[resp.result()]++;
Expand All @@ -699,12 +704,19 @@ BOOST_FIXTURE_TEST_CASE(requests_in_flight, http_plugin_test_fixture) {
return count_of_status_replies;
};

auto wait_for_no_bytes_in_flight = [&](uint16_t max = std::numeric_limits<uint16_t>::max()) {
while (http_plugin->bytes_in_flight() > 0 && --max)
std::this_thread::sleep_for(std::chrono::milliseconds(5));
BOOST_CHECK(max > 0);
};


//8 requests to start with
send_requests(8u);
std::unordered_map<boost::beast::http::status, size_t> r = scan_http_replies();
BOOST_REQUIRE_EQUAL(r[boost::beast::http::status::ok], 8u);
connections.clear();
wait_for_no_bytes_in_flight();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this test case has to do with requests in flight, not bytes, so this feels mismatched but maybe it still serves enough of its purpose?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A requests in flight would be better and useful to verify in both cases. I'll add it.


//24 requests will exceed threshold
send_requests(24u);
Expand All @@ -713,6 +725,7 @@ BOOST_FIXTURE_TEST_CASE(requests_in_flight, http_plugin_test_fixture) {
BOOST_REQUIRE_GT(r[boost::beast::http::status::service_unavailable], 0u);
BOOST_REQUIRE_EQUAL(r[boost::beast::http::status::service_unavailable] + r[boost::beast::http::status::ok], 24u);
connections.clear();
wait_for_no_bytes_in_flight();

//requests should still work
send_requests(8u);
Expand All @@ -722,6 +735,7 @@ BOOST_FIXTURE_TEST_CASE(requests_in_flight, http_plugin_test_fixture) {
}
BOOST_REQUIRE_EQUAL(r[boost::beast::http::status::ok], 8u);
connections.clear();
wait_for_no_bytes_in_flight();
}

//A warning for future tests: destruction of http_plugin_test_fixture sometimes does not destroy http_plugin's listeners. Tests
Expand Down
Loading