ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-31 14:40:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

depot_download_manager: fetchurl watchdog

Browse Source 
If fetchurl the amount of bytes downloaded by fetchurl does not change
for 5 seconds, respawn it.
This commit is contained in:
Norman Feske 2019-03-18 17:37:08 +01:00 committed by Christian Helmuth
parent 4f99224255
commit 6763ac29d9
2 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
repos/gems/src/app/depot_download_manager/gen_fetchurl.cc
View File

@ -18,10 +18,11 @@ void Depot_download_manager::gen_fetchurl_start_content(Xml_generator &xml,
Url const &current_user_url, Url const &current_user_url,
Fetchurl_version version) Fetchurl_version version)
{ {
xml.attribute("version", version.value);
gen_common_start_content(xml, "fetchurl", gen_common_start_content(xml, "fetchurl",
Cap_quota{500}, Ram_quota{8*1024*1024}); Cap_quota{500}, Ram_quota{8*1024*1024});
xml.attribute("version", version.value);
xml.node("config", [&] () { xml.node("config", [&] () {
xml.node("libc", [&] () { xml.node("libc", [&] () {
xml.attribute("stdout", "/dev/log"); xml.attribute("stdout", "/dev/log");

51
repos/gems/src/app/depot_download_manager/main.cc
View File

@ -16,6 +16,7 @@
#include <base/heap.h> #include <base/heap.h>
#include <base/attached_rom_dataspace.h> #include <base/attached_rom_dataspace.h>
#include <os/reporter.h> #include <os/reporter.h>
#include <timer_session/connection.h>
/* local includes */ /* local includes */
#include "xml.h" #include "xml.h"
@ -195,10 +196,18 @@ struct Depot_download_manager::Main : Import::Download_progress
Signal_handler<Main> _fetchurl_progress_handler { Signal_handler<Main> _fetchurl_progress_handler {
_env.ep(), *this, &Main::_handle_fetchurl_progress }; _env.ep(), *this, &Main::_handle_fetchurl_progress };
/* number of bytes downloaded by current fetchurl instance */
uint64_t _downloaded_bytes { };
void _handle_fetchurl_progress() void _handle_fetchurl_progress()
{ {
_fetchurl_progress.update(); _fetchurl_progress.update();
/* count sum of bytes downloaded by current fetchurl instance */
_downloaded_bytes = 0;
_fetchurl_progress.xml().for_each_sub_node("fetch", [&] (Xml_node fetch) {
_downloaded_bytes += fetch.attribute_value("now", 0ULL); });
if (_import.constructed()) { if (_import.constructed()) {
_import->apply_download_progress(*this); _import->apply_download_progress(*this);
@ -210,6 +219,42 @@ struct Depot_download_manager::Main : Import::Download_progress
_update_state_report(); _update_state_report();
} }
struct Fetchurl_watchdog
{
Main &_main;
Timer::Connection _timer { _main._env };
Signal_handler<Fetchurl_watchdog> _handler {
_main._env.ep(), *this, &Fetchurl_watchdog::_handle };
uint64_t _observed_downloaded_bytes = _main._downloaded_bytes;
void _handle()
{
if (_main._downloaded_bytes != _observed_downloaded_bytes) {
_observed_downloaded_bytes = _main._downloaded_bytes;
return;
}
warning("fetchurl got stuck, respawning");
/* downloads got stuck, try replacing fetchurl with new instance */
_main._fetchurl_count.value++;
_main._generate_init_config();
}
enum { PERIOD_SECONDS = 5UL };
Fetchurl_watchdog(Main &main) : _main(main)
{
_timer.sigh(_handler);
_timer.trigger_periodic(PERIOD_SECONDS*1000*1000);
}
};
Constructible<Fetchurl_watchdog> _fetchurl_watchdog { };
Main(Env &env) : _env(env) Main(Env &env) : _env(env)
{ {
_dependencies .sigh(_query_result_handler); _dependencies .sigh(_query_result_handler);
@ -269,7 +314,9 @@ void Depot_download_manager::Main::_generate_init_config(Xml_generator &xml)
gen_depot_query_start_content(xml, _installation.xml(), gen_depot_query_start_content(xml, _installation.xml(),
_next_user, _depot_query_count, _jobs); }); _next_user, _depot_query_count, _jobs); });
if (_import.constructed() && _import->downloads_in_progress()) { bool const fetchurl_running = _import.constructed()
&& _import->downloads_in_progress();
if (fetchurl_running) {
try { try {
xml.node("start", [&] () { xml.node("start", [&] () {
gen_fetchurl_start_content(xml, *_import, _current_user_url(), gen_fetchurl_start_content(xml, *_import, _current_user_url(),
@ -293,6 +340,8 @@ void Depot_download_manager::Main::_generate_init_config(Xml_generator &xml)
gen_extract_start_content(xml, *_import, _current_user_path(), gen_extract_start_content(xml, *_import, _current_user_path(),
_current_user_name()); }); _current_user_name()); });
} }
_fetchurl_watchdog.conditional(fetchurl_running, *this);
} }