Merge lp:~charlesk/keeper/fix-slow-tar-creator-test into lp:keeper/devel
Proposed by
Charles Kerr
Status: | Merged |
---|---|
Approved by: | Charles Kerr |
Approved revision: | 143 |
Merged at revision: | 122 |
Proposed branch: | lp:~charlesk/keeper/fix-slow-tar-creator-test |
Merge into: | lp:keeper/devel |
Prerequisite: | lp:~xavi-garcia-mena/keeper/restore |
Diff against target: |
98 lines (+31/-29) 1 file modified
src/tar/tar-creator.cpp (+31/-29) |
To merge this branch: | bzr merge lp:~charlesk/keeper/fix-slow-tar-creator-test |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Xavi Garcia (community) | Approve | ||
unity-api-1-bot | continuous-integration | Approve | |
Review via email: mp+311984@code.launchpad.net |
Commit message
Fix TarCreator::step() to block less
Description of the change
Have TarCreator::step() take smaller steps so that in practice the function won't block.
Also, fix side bug: step() wasn't handling for the case of archive_
To post a comment you must log in.
FAILED: Continuous integration, rev:143 /code.launchpad .net/~charlesk/ keeper/ fix-slow- tar-creator- test/+merge/ 311984/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
https:/ /jenkins. canonical. com/unity- api-1/job/ lp-keeper- ci/143/ /jenkins. canonical. com/unity- api-1/job/ build/1199 /jenkins. canonical. com/unity- api-1/job/ build-0- fetch/1206 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 992 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 992/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= zesty/992 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= zesty/992/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 992 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 992/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= zesty/992 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= zesty/992/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 992 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 992/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= zesty/992 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= zesty/992/ artifact/ output/ *zip*/output. zip
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/unity- api-1/job/ lp-keeper- ci/143/ rebuild
https:/