[RHELC-895] Fix error message when repoquery fails to retrieve information on kmod packages #818

abadger · 2023-05-05T10:35:21Z

When repoquery fails to run (for instance, when repoquery decides that there isn't enough disk space to download metadata from the repository), we were printing an error message that there were no kmod containing packages. With this change, we will print an error message that says repoquery failed.

Fixes https://issues.redhat.com/browse/RHELC-895
Fixes #610

Jira Issues: RHELC-895

Checklist

PR has been tested manually in a VM (either author or reviewer)
Jira issue has been made public if possible
[RHELC-] is part of the PR title
GitHub label has been added to help with Release notes
PR title explains the change from the user's point of view
Code and tests are documented properly
The commits are squashed to as few commits as possible (without losing data)
When merged: Jira issue has been updated to Release Pending if relevant

codecov · 2023-05-05T10:39:14Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (dfbb8ee) 93.78% compared to head (bcece6f) 93.87%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #818      +/-   ##
==========================================
+ Coverage   93.78%   93.87%   +0.09%     
==========================================
  Files          47       47              
  Lines        4345     4360      +15     
  Branches      769      773       +4     
==========================================
+ Hits         4075     4093      +18     
+ Misses        192      190       -2     
+ Partials       78       77       -1

Flag	Coverage Δ
centos-linux-7	`88.82% <100.00%> (+0.10%)`	⬆️
centos-linux-8	`89.88% <100.00%> (+0.10%)`	⬆️
centos-linux-9	`89.95% <100.00%> (+0.10%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
...rt2rhel/actions/pre_ponr_changes/kernel_modules.py	`100.00% <100.00%> (+3.89%)`	⬆️
convert2rhel/pkghandler.py	`94.14% <100.00%> (+0.01%)`	⬆️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

convert2rhel/checks.py

Unittests added

convert2rhel/checks.py

abadger · 2023-05-09T16:51:24Z

/packit test

abadger · 2023-06-14T13:08:19Z

/packit test

convert2rhel/actions/pre_ponr_changes/kernel_modules.py

convert2rhel/unit_tests/actions/pre_ponr_changes/kernel_modules_test.py

danmyway · 2023-08-08T12:37:44Z

/packit build

convert2rhel/actions/pre_ponr_changes/kernel_modules.py

bocekm · 2023-08-08T16:24:47Z

convert2rhel/actions/pre_ponr_changes/kernel_modules.py

@@ -67,8 +76,26 @@ def _get_rhel_supported_kmods(self):
        if system_info.version.major == 8:
            basecmd.append("--setopt=module_platform_id=platform:el8")

+        active_repos = ["--disablerepo=*"]


This is tricky. What if the user uses the --disablerepo c2r option?

We handle it in the call_yum_cmd (https://github.com/oamg/convert2rhel/blob/v1.3.2/convert2rhel/pkghandler.py#L123).

I think --disablerepo from the c2r options is safe to ignore as --disablerepo=* is a superset of anything that the user might have specified.

OTOH, prior to this change, we didn't disable any repos when running repoqery in this function. I'm not sure how that worked... It seems like we would be running repoquery using both the vendor's repos and the RHEL repos in that case, but we only want to find kernel modules that are in packages in the RHEL repos here?

I think --disablerepo from the c2r options is safe to ignore as --disablerepo=* is a superset of anything that the user might have specified.

Ah, right, that makes sense.

It seems like we would be running repoquery using both the vendor's repos and the RHEL repos in that case, but we only want to find kernel modules that are in packages in the RHEL repos here?

Yes, we want to query just the RHEL repos. Previously we've been using the --repoid option.

--repoid=<repo> Specify which repository to query. Using this option disables all repositories not explicitly enabled with --repoid option (can be used multiple times). By default repoquery uses whatever repositories are enabled in YUM configuration.

So we were really querying just the RHEL repos. Now given that yum doesn't have this option and you've switched to using --enablerepo then passing --disablerepo=* makes sense.

has-bot · 2023-09-13T20:04:15Z

/packit test --labels tier0

@oamg/conversions-qe please review results and provide ack.

Log | Bot Usage

abadger · 2023-10-02T18:35:28Z

@bocekm Does the latest set of changes address your concerns?

convert2rhel/actions/pre_ponr_changes/kernel_modules.py

bocekm · 2023-10-03T11:50:13Z

convert2rhel/actions/pre_ponr_changes/kernel_modules.py

@@ -67,8 +76,26 @@ def _get_rhel_supported_kmods(self):
        if system_info.version.major == 8:
            basecmd.append("--setopt=module_platform_id=platform:el8")

+        active_repos = ["--disablerepo=*"]


I think --disablerepo from the c2r options is safe to ignore as --disablerepo=* is a superset of anything that the user might have specified.

Ah, right, that makes sense.

It seems like we would be running repoquery using both the vendor's repos and the RHEL repos in that case, but we only want to find kernel modules that are in packages in the RHEL repos here?

Yes, we want to query just the RHEL repos. Previously we've been using the --repoid option.

--repoid=<repo> Specify which repository to query. Using this option disables all repositories not explicitly enabled with --repoid option (can be used multiple times). By default repoquery uses whatever repositories are enabled in YUM configuration.

So we were really querying just the RHEL repos. Now given that yum doesn't have this option and you've switched to using --enablerepo then passing --disablerepo=* makes sense.

abadger · 2023-10-06T15:47:22Z

This is Dev complete. Just needs integration tests.

r0x0d · 2023-10-06T17:37:45Z

Probably its best to rebase this and get the newest changes? Making sure the other targets will run the tests properly as well

abadger · 2023-10-06T18:08:54Z

Rebased and also squashed into one commit.

Venefilyn · 2023-10-31T13:57:19Z

@abadger Needs a rebase then we can merge

…d packages * When repoquery fails to run (for instance, when repoquery decides that there isn't enough disk space to download metadata from the repository), we were printing an error message that there were no kmod containing packages. With this change, we will print an error message that says repoquery failed. * Now that we are printing a unified report for pre-check failures, we need to include the referenced yum output in the logger.critical message. Otherwise, the report will say to look at the "above yum output", but that output won't be present in the report handed to insights. Fixes https://issues.redhat.com/browse/RHELC-895 Fixes oamg#610

abadger · 2023-10-31T14:09:06Z

@SpyTec Rebased and pushed!

abadger added the bug-fix A bug has been fixed label May 5, 2023

Venefilyn previously requested changes May 5, 2023

View reviewed changes

convert2rhel/checks.py Outdated Show resolved Hide resolved

abadger force-pushed the fixing-repoquery branch from e7cf0d9 to 1e72ae5 Compare May 5, 2023 10:54

Venefilyn approved these changes May 5, 2023

View reviewed changes

bocekm reviewed May 5, 2023

View reviewed changes

convert2rhel/checks.py Outdated Show resolved Hide resolved

abadger marked this pull request as draft May 10, 2023 16:25

This was referenced May 11, 2023

convert2rhel migration error #824

Closed

[RHELC-1003] Allow to skip kernel check even if packages are available #817

Merged

abadger force-pushed the fixing-repoquery branch from 1e72ae5 to f3035b4 Compare June 1, 2023 00:53

abadger marked this pull request as ready for review June 1, 2023 00:53

abadger force-pushed the fixing-repoquery branch from f3035b4 to 7a35307 Compare July 13, 2023 21:56

github-advanced-security bot found potential problems Jul 13, 2023

View reviewed changes

convert2rhel/actions/pre_ponr_changes/kernel_modules.py Fixed Show fixed Hide fixed

convert2rhel/unit_tests/actions/pre_ponr_changes/kernel_modules_test.py Fixed Show fixed Hide fixed

abadger force-pushed the fixing-repoquery branch from 7a35307 to 835d7b7 Compare July 13, 2023 22:06

bocekm requested changes Aug 8, 2023

View reviewed changes

abadger force-pushed the fixing-repoquery branch from 54a32a6 to 0ebd74f Compare September 13, 2023 19:07

abadger added the tests-run-tier0 PR ready to run the essential test suit. Equivalent to `/packit test --labels tier0`. label Sep 13, 2023

r0x0d reviewed Oct 2, 2023

View reviewed changes

convert2rhel/actions/pre_ponr_changes/kernel_modules.py Outdated Show resolved Hide resolved

bocekm approved these changes Oct 3, 2023

View reviewed changes

abadger force-pushed the fixing-repoquery branch 2 times, most recently from 4510e83 to c7e1530 Compare October 6, 2023 18:08

abadger force-pushed the fixing-repoquery branch from c7e1530 to f12e780 Compare October 6, 2023 18:11

Venefilyn approved these changes Oct 31, 2023

View reviewed changes

abadger force-pushed the fixing-repoquery branch from f12e780 to bcece6f Compare October 31, 2023 14:08

bocekm merged commit 8a7b98c into oamg:main Nov 2, 2023
17 of 49 checks passed

pr-watson mentioned this pull request Dec 8, 2023

Bump to version 1.6.0 #1008

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RHELC-895] Fix error message when repoquery fails to retrieve information on kmod packages #818

[RHELC-895] Fix error message when repoquery fails to retrieve information on kmod packages #818

abadger commented May 5, 2023 •

edited

Loading

codecov bot commented May 5, 2023 •

edited

Loading

abadger commented May 9, 2023

abadger commented Jun 14, 2023

danmyway commented Aug 8, 2023

bocekm Aug 8, 2023

abadger Aug 14, 2023

bocekm Oct 3, 2023

has-bot commented Sep 13, 2023

abadger commented Oct 2, 2023

bocekm Oct 3, 2023

abadger commented Oct 6, 2023

r0x0d commented Oct 6, 2023

abadger commented Oct 6, 2023

Venefilyn commented Oct 31, 2023

abadger commented Oct 31, 2023

[RHELC-895] Fix error message when repoquery fails to retrieve information on kmod packages #818

[RHELC-895] Fix error message when repoquery fails to retrieve information on kmod packages #818

Conversation

abadger commented May 5, 2023 • edited Loading

codecov bot commented May 5, 2023 • edited Loading

Codecov Report

abadger commented May 9, 2023

abadger commented Jun 14, 2023

danmyway commented Aug 8, 2023

bocekm Aug 8, 2023

Choose a reason for hiding this comment

abadger Aug 14, 2023

Choose a reason for hiding this comment

bocekm Oct 3, 2023

Choose a reason for hiding this comment

has-bot commented Sep 13, 2023

abadger commented Oct 2, 2023

bocekm Oct 3, 2023

Choose a reason for hiding this comment

abadger commented Oct 6, 2023

r0x0d commented Oct 6, 2023

abadger commented Oct 6, 2023

Venefilyn commented Oct 31, 2023

abadger commented Oct 31, 2023

abadger commented May 5, 2023 •

edited

Loading

codecov bot commented May 5, 2023 •

edited

Loading