MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-16 15:00:51 +01:00
Code Issues Releases Wiki Activity

modules/s_fetch: Improve timeout and retry algorithm.

Browse source
This commit is contained in:
Jason Volk 2019-06-04 20:08:08 -07:00
parent 2992a1ae34
commit 64a7bbed00
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
modules/s_fetch.cc
View file

@ -734,10 +734,26 @@ ircd::m::fetch::request_handle()
if(!next.wait(seconds(timeout), std::nothrow)) if(!next.wait(seconds(timeout), std::nothrow))
{ {
const auto now(ircd::time()); const auto now(ircd::time());
for(const auto &request : requests) for(auto it(begin(requests)); it != end(requests); ++it)
if(!request.finished && timedout(request, now)) {
retry(const_cast<fetch::request &>(request)); auto &request(const_cast<fetch::request &>(*it));
if(request.finished < 0 || request.last == std::numeric_limits<time_t>::max())
continue;
if(request.finished == 0 && timedout(request, now))
{
retry(request);
continue;
}
if(request.finished > 0 && timedout(request, now))
{
request.finished = -1;
continue;
}
}
request_cleanup();
return; return;
} }
@ -750,6 +766,7 @@ ircd::m::fetch::request_handle()
return; return;
request_handle(it); request_handle(it);
dock.notify_all();
} }
void void
@ -761,10 +778,10 @@ try
const_cast<fetch::request &>(*it) const_cast<fetch::request &>(*it)
}; };
if(!request.started || !request.last || request.finished) if(!request.started || !request.last || request.finished < 0)
return; return;
if(!handle(request)) if(!request.finished && !handle(request))
return; return;
assert(request.finished); assert(request.finished);
@ -775,8 +792,9 @@ try
__builtin_unreachable(); __builtin_unreachable();
} }
assert(!request.eptr);
request.last = std::numeric_limits<time_t>::max();
complete.emplace_back(it); complete.emplace_back(it);
dock.notify_all();
} }
catch(const std::exception &e) catch(const std::exception &e)
{ {
@ -826,7 +844,6 @@ ircd::m::fetch::eval_handle()
{ {
assert(!complete.empty()); assert(!complete.empty());
complete.pop_front(); complete.pop_front();
dock.notify_all();
}}; }};
const auto it const auto it
@ -849,6 +866,7 @@ try
const unwind free{[&request] const unwind free{[&request]
{ {
request.finished = -1; request.finished = -1;
dock.notify_all();
}}; }};
assert(!request.eptr); assert(!request.eptr);
@ -1091,7 +1109,6 @@ ircd::m::fetch::finish(request &request)
{ {
assert(request.started); assert(request.started);
request.finished = ircd::time(); request.finished = ircd::time();
dock.notify_all();
} }
bool bool