diff options
| author | Frank Ch. Eigler <fche@redhat.com> | 2023-04-13 13:11:56 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@redhat.com> | 2023-04-13 13:23:01 -0400 |
| commit | 7676df99484184ff971cf37f3aa54d5e457d6e35 (patch) | |
| tree | e19566f216d7ddc779711800db2953d993fbe6be | |
| parent | 6e9718089b05403947d8255423a849d425305925 (diff) | |
| download | elfutils-7676df99484184ff971cf37f3aa54d5e457d6e35.tar.gz | |
PR30348: debuginfod: retry partial archive scans
On some public debuginfod servers, it was observed that errors
may occur during individual archive scanning operations. That's
fine, but previous code still went ahead and marked the archive
"done" by inserting a record into the *_file_mtime_scanned table.
New code ensures that exceptions propagate for these cases, and an
archive that encountered an error while scanning will be retried
later.
Signed-off-by: Frank Ch. Eigler <fche@redhat.com>
| -rw-r--r-- | debuginfod/ChangeLog | 5 | ||||
| -rw-r--r-- | debuginfod/debuginfod.cxx | 16 |
2 files changed, 21 insertions, 0 deletions
diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog index f13c28d5..070dad03 100644 --- a/debuginfod/ChangeLog +++ b/debuginfod/ChangeLog @@ -1,3 +1,8 @@ +2023-04-13 Frank Ch. Eigler <fche@redhat.com> + + * debuginfod.cxx (archive_classify, scan_archive_file): Catch and + propagate exceptions during archive scans. + 2023-03-30 Jan Alexander Steffens (heftig) <heftig@archlinux.org> * debuginfod-client.c (update_atime): New function. diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx index 5ef6cc32..e981d137 100644 --- a/debuginfod/debuginfod.cxx +++ b/debuginfod/debuginfod.cxx @@ -3268,6 +3268,7 @@ archive_classify (const string& rps, string& archive_extension, if (verbose > 3) obatched(clog) << "libarchive scanning " << rps << endl; + bool any_exceptions = false; while(1) // parse archive entries { if (interrupted) @@ -3405,8 +3406,17 @@ archive_classify (const string& rps, string& archive_extension, catch (const reportable_exception& e) { e.report(clog); + any_exceptions = true; + // NB: but we allow the libarchive iteration to continue, in + // case we can still gather some useful information. That + // would allow some webapi queries to work, until later when + // this archive is rescanned. (Its vitals won't go into the + // _file_mtime_scanned table until after a successful scan.) } } + + if (any_exceptions) + throw reportable_exception("exceptions encountered during archive scan"); } @@ -3453,6 +3463,7 @@ scan_archive_file (const string& rps, const stat_t& st, // extract the archive contents unsigned my_fts_executable = 0, my_fts_debuginfo = 0, my_fts_sref = 0, my_fts_sdef = 0; bool my_fts_sref_complete_p = true; + bool any_exceptions = false; try { string archive_extension; @@ -3475,6 +3486,7 @@ scan_archive_file (const string& rps, const stat_t& st, catch (const reportable_exception& e) { e.report(clog); + any_exceptions = true; } if (verbose > 2) @@ -3484,6 +3496,7 @@ scan_archive_file (const string& rps, const stat_t& st, << " debuginfos=" << my_fts_debuginfo << " srefs=" << my_fts_sref << " sdefs=" << my_fts_sdef + << " exceptions=" << any_exceptions << endl; fts_executable += my_fts_executable; @@ -3491,6 +3504,9 @@ scan_archive_file (const string& rps, const stat_t& st, fts_sref += my_fts_sref; fts_sdef += my_fts_sdef; + if (any_exceptions) + throw reportable_exception("exceptions encountered during archive scan"); + if (my_fts_sref_complete_p) // leave incomplete? ps_scan_done .reset() |