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>

diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
index f13c28d5c6f723c87ead5b54d8476ef98df4e91b..070dad03fba1e1ec58a61a3bfc3a38df3ed5828d 100644 (file)
--- 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 5ef6cc32189b5669bbbdfe247a1a67122d574b94..e981d137223387b46576ac6420429ec67b71f8fd 100644 (file)
--- 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()