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

Make http client restart requests #1883

Closed
wants to merge 9 commits into from
Closed

Make http client restart requests #1883

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7536779
loopback_socket: Rename buffer's shutdown() to abort()
xemul Jun 4, 2024
32c61d0
loopback_socket: Shutdown socket on EOF close
xemul Jun 4, 2024
09733c2
test/http: Generalize http connection factory
xemul Jun 4, 2024
682cb63
http/client: Document max_connections
xemul Jun 4, 2024
8160eb2
http/client: Fix parser result checking
xemul Sep 22, 2023
8fedb6b
http/client: Introduce make_new_connection()
xemul Oct 17, 2023
6d38fd6
http/client: Pass request and handle by reference
xemul Sep 21, 2023
ec081a2
http/client: Fix indentation after previous patch
xemul Sep 21, 2023
3c5c7ea
http/client: Retry request over fresh connection in case old one failed
xemul Oct 17, 2023
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
20 changes: 14 additions & 6 deletions tests/unit/loopback_socket.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private:
queue<temporary_buffer<char>> _q{1};
loopback_error_injector* _error_injector;
type _type;
promise<> _shutdown;
std::optional<promise<>> _shutdown;
public:
loopback_buffer(loopback_error_injector* error_injection, type t) : _error_injector(error_injection), _type(t) {}
future<> push(temporary_buffer<char>&& b) {
Expand Down Expand Up @@ -92,16 +92,22 @@ public:
return _q.pop_eventually();
}
void abort() noexcept {
nyh marked this conversation as resolved.
Show resolved Hide resolved
if (!_aborted) {
// it can be called by both -- reader and writer socket impls
_shutdown.set_value();
}
shutdown();
_aborted = true;
_q.abort(std::make_exception_ptr(std::system_error(EPIPE, std::system_category())));
}
void shutdown() noexcept {
Copy link
Contributor

Choose a reason for hiding this comment

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

I got lost here. You renamed the old shutdown() to abort, and now you're re-introducing shutdown()? Or maybe it's a different overload with the same name?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, yes, I'm introducing another shutdown(). Old shutdown (that got renamed to abort) now calls new shutdown and aborts the inner queue

// it can be called by both -- reader and writer socket impls
if (_shutdown.has_value()) {
_shutdown->set_value();
_shutdown.reset();
}
}

future<> wait_input_shutdown() {
return _shutdown.get_future();
assert(!_shutdown.has_value());
nyh marked this conversation as resolved.
Show resolved Hide resolved
_shutdown.emplace();
return _shutdown->get_future();
}
};

Expand Down Expand Up @@ -160,6 +166,8 @@ public:
future<> close() override {
if (!_eof) {
_buffer->abort();
} else {
_buffer->shutdown();
}
return make_ready_future<>();
}
Expand Down