| Message ID | 20211123135919.26315-1-richard.purdie@linuxfoundation.org |
|---|---|
| State | Accepted, archived |
| Commit | b83823ce44e7531bbd2bfa62062c04147a11f724 |
| Headers | show |
| Series | buildhistory: Fix do_package race issues | expand |
Thanks Richard, this should remove occasional false failures from AUH runs :) Alex On Tue, 23 Nov 2021 at 14:59, Richard Purdie < richard.purdie@linuxfoundation.org> wrote: > The buildhistory_list_pkg_files function uses data from do_package, not > do_packagedata. Usally the two are restored together but it may see > a half complete directory or other races issues depending on timing. > > Rework the function so that it uses the correct task dependencies. This > should avoid races but means the data is only restored to buildhistory > if the do_package or do_package_setscene tasks are restored. > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > --- > meta/classes/buildhistory.bbclass | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/meta/classes/buildhistory.bbclass > b/meta/classes/buildhistory.bbclass > index 64df432f136..daa96f3b63b 100644 > --- a/meta/classes/buildhistory.bbclass > +++ b/meta/classes/buildhistory.bbclass > @@ -91,13 +91,19 @@ buildhistory_emit_sysroot() { > python buildhistory_emit_pkghistory() { > if d.getVar('BB_CURRENTTASK') in ['populate_sysroot', > 'populate_sysroot_setscene']: > bb.build.exec_func("buildhistory_emit_sysroot", d) > - > - if not d.getVar('BB_CURRENTTASK') in ['packagedata', > 'packagedata_setscene']: > return 0 > > if not "package" in (d.getVar('BUILDHISTORY_FEATURES') or "").split(): > return 0 > > + if d.getVar('BB_CURRENTTASK') in ['package', 'package_setscene']: > + # Create files-in-<package-name>.txt files containing a list of > files of each recipe's package > + bb.build.exec_func("buildhistory_list_pkg_files", d) > + return 0 > + > + if not d.getVar('BB_CURRENTTASK') in ['packagedata', > 'packagedata_setscene']: > + return 0 > + > import re > import json > import shlex > @@ -319,8 +325,6 @@ python buildhistory_emit_pkghistory() { > > write_pkghistory(pkginfo, d) > > - # Create files-in-<package-name>.txt files containing a list of files > of each recipe's package > - bb.build.exec_func("buildhistory_list_pkg_files", d) > oe.qa.exit_if_errors(d) > } > > -- > 2.32.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#158603): > https://lists.openembedded.org/g/openembedded-core/message/158603 > Mute This Topic: https://lists.openembedded.org/mt/87258776/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 64df432f136..daa96f3b63b 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -91,13 +91,19 @@ buildhistory_emit_sysroot() { python buildhistory_emit_pkghistory() { if d.getVar('BB_CURRENTTASK') in ['populate_sysroot', 'populate_sysroot_setscene']: bb.build.exec_func("buildhistory_emit_sysroot", d) - - if not d.getVar('BB_CURRENTTASK') in ['packagedata', 'packagedata_setscene']: return 0 if not "package" in (d.getVar('BUILDHISTORY_FEATURES') or "").split(): return 0 + if d.getVar('BB_CURRENTTASK') in ['package', 'package_setscene']: + # Create files-in-<package-name>.txt files containing a list of files of each recipe's package + bb.build.exec_func("buildhistory_list_pkg_files", d) + return 0 + + if not d.getVar('BB_CURRENTTASK') in ['packagedata', 'packagedata_setscene']: + return 0 + import re import json import shlex @@ -319,8 +325,6 @@ python buildhistory_emit_pkghistory() { write_pkghistory(pkginfo, d) - # Create files-in-<package-name>.txt files containing a list of files of each recipe's package - bb.build.exec_func("buildhistory_list_pkg_files", d) oe.qa.exit_if_errors(d) }
The buildhistory_list_pkg_files function uses data from do_package, not do_packagedata. Usally the two are restored together but it may see a half complete directory or other races issues depending on timing. Rework the function so that it uses the correct task dependencies. This should avoid races but means the data is only restored to buildhistory if the do_package or do_package_setscene tasks are restored. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/classes/buildhistory.bbclass | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)