On Tue, Jul 16, 2024 at 06:15:16PM -0400, Frank Ch. Eigler wrote:
> Hi -
>
> > [...] I'll send it through the testsuite
> > trybots here. [...]
>
> There was some success and there was some failure. :-)
>
> all 11 runs:
>
> https://builder.sourceware.org/testruns/?commitishes=&has_expfile_glob=&has_trsfile_glob=&has_keyvalue_k=testrun.git_describe&has_keyvalue_op=glob&has_keyvalue_v=*&has_keyvalue2_k=source.gitbranch&has_keyvalue2_op=glob&has_keyvalue2_v=*users%2Ffche%2Ftry-xz*&order_by=testrun.authored.time&order=desc
>
> in a grid view:
>
> https://builder.sourceware.org/r_grid_testcase/?trid=9b0340db2a771c5b6483132afd75139699c4f8e5&toplevel=True&vertical=source.gitdescribe&v_limit=5&horizontal=uname-m&h_limit=10&opt_keyword_key=source.gitbranch&opt_keyword_value=*fche%2Ftry-xz*
>
> e.g. failure:
>
> https://builder.sourceware.org/testrun/2550ae9a06868d7e7f4c62176960c04f4534d8d0?filename=tests%2Frun-debuginfod-extraction-passive.sh.log#line657
Yup, that was a goof, and I don't know why I missed it on my local test
run. This is the fix:
diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index 6fb4627c..08114f2e 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -2737,8 +2737,9 @@ handle_buildid_r_match (bool internal_req_p,
}
// no match ... look for a seekable entry
- bool populate_seekable = true;
- unique_ptr<sqlite_ps> pp (new sqlite_ps (db, "rpm-seekable-query",
+ bool populate_seekable = ! passive_p;
+ unique_ptr<sqlite_ps> pp (new sqlite_ps (internal_req_p ? db : dbq,
+ "rpm-seekable-query",
"select type, size, offset, mtime
from " BUILDIDS "_r_seekable "
"where file = ? and content = ?"));
rc = pp->reset().bind(1, b_id0).bind(2, b_id1).step();
I'll fold that in and include it in the next version.
