Merge into trunk : speed-optimization : Code : Checkbox

Status:	Merged
Approved by:	Maciej Kisielewski on 2016-10-05
Approved revision:	4520
Merged at revision:	4517
Proposed branch:	lp://staging/~kissiel/checkbox/speed-optimization
Merge into:	lp://staging/checkbox
Diff against target:	71 lines (+6/-8) 4 files modified checkbox-ng/checkbox_ng/misc.py (+1/-1) plainbox/plainbox/impl/session/state.py (+1/-1) plainbox/plainbox/impl/unit/test_unit.py (+0/-3) plainbox/plainbox/impl/unit/unit.py (+4/-3)
To merge this branch:	bzr merge lp://staging/~kissiel/checkbox/speed-optimization
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Po-Hsu Lin		Approve on 2016-10-05
Paul Larson	2016-10-04	Approve on 2016-10-04
Review via email: mp+307553@code.staging.launchpad.net

Description of the change

This MR is the first (and simple) patch set that improves plainbox startup time.

The speed-up depends on how many jobs there are in your provider 'database'.

Here are benchmarks from my slow NUC:

1000 jobs - 44s -> 24s
2500 jobs - 2m43s -> 1m19s

The benchmarks were done using this tool:
https://code.launchpad.net/~kissiel/+git/benchcbox/+ref/master

The tool generates providers and checkbox-cli launcher that doesn't run any of the jobs. Measuring wall time of running this launcher gives an estimate how long checkbox takes to 'spool up'.

Revision history for this message

Paul Larson (pwlars) wrote on 2016-10-04:

#

Wow, part of me really wants to pick this apart and find if there are even more gains, compare it to normal sets, and things like that, but I see no reason to block such an obvious improvement for any time at all. It's hard to argue with those results, this is great!

review: Approve

Revision history for this message

Po-Hsu Lin (cypressyew) wrote on 2016-10-05:

#

Cool stuff, thanks.

review: Approve

Revision history for this message

Sylvain Pineau (sylvain-pineau) wrote on 2016-10-05:

#

Download full text (10.0 KiB)

The attempt to merge lp:~kissiel/checkbox/speed-optimization into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.11user 0.03system 0:05.50elapsed 2%CPU (0avgtext+0avgdata 9960maxresident)k
[precise] (timing) 0inputs+32outputs (0major+6827minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 45.51user 18.60system 1:07.10elapsed 95%CPU (0avgtext+0avgdata 97156maxresident)k
[precise] (timing) 0inputs+19168outputs (0major+3199615minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: [31;1mFAIL[39;0m
[precise-testing] stdout: http://paste.ubuntu.com/23278019/
[precise-testing] stderr: http://paste.ubuntu.com/23278020/
[precise-testing] (timing) Command exited with non-zero status 1
[precise-testing] (timing) 0.69user 0.14system 0:00.85elapsed 98%CPU (0avgtext+0avgdata 48608maxresident)k
[precise-testing] (timing) 0inputs+1280outputs (0major+22164minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: [32;1mPASS[39;0m
[precise-testing] (timing) 31.22user 0.35system 0:31.61elapsed 99%CPU (0avgtext+0avgdata 150684maxresident)k
[precise-testing] (timing) 0inputs+1376outputs (0major+39712minor)pagefaults 0swaps
Found a test script: ./converged/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: [32;1mPASS[39;0m
[precise-testing] (timing) 0.00user 0.02system 0:00.02elapsed 86%CPU (0avgtext+0avgdata 2232maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2345minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: [32;1mPASS[39;0m
[precise-testing] (timing) 1.05user 0.09system 0:01.15elapsed 99%CPU (0avgtext+0avgdata 47200maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+14466minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: [32;1mPASS[39;0m
[precise-testing] (timing) 0.22user 0.05system 0:00.28elapsed 98%CPU (0avgtext+0avgdata 14568maxresident)k
[precise-testing] (timing) 0inputs+88outputs (0major+6046minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: [32;1mPASS[39;0m
[precise-testing] (timing) 38.72user 1.39system 0:40.26elapsed 99%CPU (0avgtext+0avgdata 201576maxresident)k
[precise-testing] (timing) 0inputs+3304outputs (0major+263264minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: [32;1mPASS[39;0m
[precise-testing] (timing) 102.37user 0.59system 1:43.22elapsed 99%CPU (0avgtext+0avgdata 185420maxresident)k
[precise-testing] (timing) 0inputs+43216outputs (0major+58278minor)pagefaults 0swaps...

The attempt to merge lp:~kissiel/checkbox/speed-optimization into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.11user 0.03system 0:05.50elapsed 2%CPU (0avgtext+0avgdata 9960maxresident)k
[precise] (timing) 0inputs+32outputs (0major+6827minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 45.51user 18.60system 1:07.10elapsed 95%CPU (0avgtext+0avgdata 97156maxresident)k
[precise] (timing) 0inputs+19168outputs (0major+3199615minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: [31;1mFAIL[39;0m
[precise-testing] stdout: http://paste.ubuntu.com/23278019/
[precise-testing] stderr: http://paste.ubuntu.com/23278020/
[precise-testing] (timing) Command exited with non-zero status 1
[precise-testing] (timing) 0.69user 0.14system 0:00.85elapsed 98%CPU (0avgtext+0avgdata 48608maxresident)k
[precise-testing] (timing) 0inputs+1280outputs (0major+22164minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: [32;1mPASS[39;0m
[precise-testing] (timing) 31.22user 0.35system 0:31.61elapsed 99%CPU (0avgtext+0avgdata 150684maxresident)k
[precise-testing] (timing) 0inputs+1376outputs (0major+39712minor)pagefaults 0swaps
Found a test script: ./converged/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: [32;1mPASS[39;0m
[precise-testing] (timing) 0.00user 0.02system 0:00.02elapsed 86%CPU (0avgtext+0avgdata 2232maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2345minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: [32;1mPASS[39;0m
[precise-testing] (timing) 1.05user 0.09system 0:01.15elapsed 99%CPU (0avgtext+0avgdata 47200maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+14466minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: [32;1mPASS[39;0m
[precise-testing] (timing) 0.22user 0.05system 0:00.28elapsed 98%CPU (0avgtext+0avgdata 14568maxresident)k
[precise-testing] (timing) 0inputs+88outputs (0major+6046minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: [32;1mPASS[39;0m
[precise-testing] (timing) 38.72user 1.39system 0:40.26elapsed 99%CPU (0avgtext+0avgdata 201576maxresident)k
[precise-testing] (timing) 0inputs+3304outputs (0major+263264minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: [32;1mPASS[39;0m
[precise-testing] (timing) 102.37user 0.59system 1:43.22elapsed 99%CPU (0avgtext+0avgdata 185420maxresident)k
[precise-testing] (timing) 0inputs+43216outputs (0major+58278minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-integration
[precise-testing] container-tests-plainbox-integration: [32;1mPASS[39;0m
[precise-testing] (timing) 0.80user 0.13system 0:00.95elapsed 98%CPU (0avgtext+0avgdata 36136maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+30960minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-checkbox/requirements/container-tests-provider-checkbox
[precise-testing] container-tests-provider-checkbox: [32;1mPASS[39;0m
[precise-testing] (timing) 4.77user 0.16system 0:04.96elapsed 99%CPU (0avgtext+0avgdata 63456maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+18501minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-piglit/requirements/container-tests-provider-piglit
[precise-testing] container-tests-provider-piglit: [32;1mPASS[39;0m
[precise-testing] (timing) 1.10user 0.09system 0:01.20elapsed 99%CPU (0avgtext+0avgdata 47536maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+14537minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-resource-generic/requirements/container-tests-provider-resource-generic
[precise-testing] container-tests-provider-resource-generic: [32;1mPASS[39;0m
[precise-testing] (timing) 1.13user 0.08system 0:01.23elapsed 99%CPU (0avgtext+0avgdata 47744maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+14583minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-ubuntu-touch/requirements/container-tests-provider-certification-touch
[precise-testing] container-tests-provider-certification-touch: [32;1mPASS[39;0m
[precise-testing] (timing) 2.03user 0.12system 0:02.17elapsed 99%CPU (0avgtext+0avgdata 52164maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+15652minor)pagefaults 0swaps
[precise-testing] Fixing file permissions in source directory
[precise-testing] Destroying container
[trusty] starting container
[trusty] (timing) 0.10user 0.04system 0:06.49elapsed 2%CPU (0avgtext+0avgdata 9956maxresident)k
[trusty] (timing) 0inputs+32outputs (0major+7029minor)pagefaults 0swaps
[trusty] provisioning container
[trusty] (timing) 79.63user 25.39system 1:48.82elapsed 96%CPU (0avgtext+0avgdata 102228maxresident)k
[trusty] (timing) 0inputs+2744outputs (0major+4314851minor)pagefaults 0swaps
[trusty-testing] Starting tests...
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[trusty-testing] container-tests-checkbox-ng-unit: [31;1mFAIL[39;0m
[trusty-testing] stdout: http://paste.ubuntu.com/23278025/
[trusty-testing] stderr: http://paste.ubuntu.com/23278026/
[trusty-testing] (timing) Command exited with non-zero status 1
[trusty-testing] (timing) 0.78user 0.12system 0:00.92elapsed 98%CPU (0avgtext+0avgdata 32612maxresident)k
[trusty-testing] (timing) 0inputs+1048outputs (0major+21763minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[trusty-testing] container-tests-checkbox-support: [32;1mPASS[39;0m
[trusty-testing] (timing) 32.25user 0.22system 0:32.49elapsed 99%CPU (0avgtext+0avgdata 109436maxresident)k
[trusty-testing] (timing) 0inputs+1096outputs (0major+38241minor)pagefaults 0swaps
Found a test script: ./converged/requirements/container-tests-touch-unit-tests
[trusty-testing] container-tests-touch-unit-tests: [32;1mPASS[39;0m
[trusty-testing] (timing) 0.01user 0.01system 0:00.03elapsed 87%CPU (0avgtext+0avgdata 2232maxresident)k
[trusty-testing] (timing) 0inputs+0outputs (0major+2352minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[trusty-testing] container-tests-provider-categories: [32;1mPASS[39;0m
[trusty-testing] (timing) 0.95user 0.07system 0:01.03elapsed 99%CPU (0avgtext+0avgdata 29796maxresident)k
[trusty-testing] (timing) 0inputs+40outputs (0major+10147minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[trusty-testing] 001-container-tests-plainbox-egg-info: [32;1mPASS[39;0m
[trusty-testing] (timing) 0.40user 0.06system 0:00.48elapsed 98%CPU (0avgtext+0avgdata 17572maxresident)k
[trusty-testing] (timing) 0inputs+88outputs (0major+10587minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[trusty-testing] container-tests-plainbox: [32;1mPASS[39;0m
[trusty-testing] (timing) 34.78user 1.06system 0:36.02elapsed 99%CPU (0avgtext+0avgdata 94916maxresident)k
[trusty-testing] (timing) 0inputs+2712outputs (0major+156267minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[trusty-testing] container-tests-plainbox-documentation: [32;1mPASS[39;0m
[trusty-testing] (timing) 79.86user 0.47system 1:20.50elapsed 99%CPU (0avgtext+0avgdata 119448maxresident)k
[trusty-testing] (timing) 0inputs+39104outputs (0major+42327minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-integration
[trusty-testing] container-tests-plainbox-integration: [32;1mPASS[39;0m
[trusty-testing] (timing) 0.84user 0.14system 0:01.00elapsed 98%CPU (0avgtext+0avgdata 28436maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+25638minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-checkbox/requirements/container-tests-provider-checkbox
[trusty-testing] container-tests-provider-checkbox: [32;1mPASS[39;0m
[trusty-testing] (timing) 4.46user 0.11system 0:04.59elapsed 99%CPU (0avgtext+0avgdata 37668maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+12161minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-piglit/requirements/container-tests-provider-piglit
[trusty-testing] container-tests-provider-piglit: [32;1mPASS[39;0m
[trusty-testing] (timing) 1.00user 0.09system 0:01.10elapsed 99%CPU (0avgtext+0avgdata 30156maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+10263minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-resource-generic/requirements/container-tests-provider-resource-generic
[trusty-testing] container-tests-provider-resource-generic: [32;1mPASS[39;0m
[trusty-testing] (timing) 0.95user 0.11system 0:01.08elapsed 98%CPU (0avgtext+0avgdata 30120maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+10342minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-ubuntu-touch/requirements/container-tests-provider-certification-touch
[trusty-testing] container-tests-provider-certification-touch: [32;1mPASS[39;0m
[trusty-testing] (timing) 1.93user 0.08system 0:02.02elapsed 99%CPU (0avgtext+0avgdata 32064maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+10742minor)pagefaults 0swaps
[trusty-testing] Fixing file permissions in source directory
[trusty-testing] Destroying container

precise-testing doesn't exist
trusty-testing doesn't exist

lp://staging/~kissiel/checkbox/speed-optimization updated on 2016-10-05

4520. By Maciej Kisielewski on 2016-10-05

checkbox-ng:misc: use expanded tuple for comparison

This way we check for 'not None' instead of going through full __eq__ chain.

Signed-off-by: Maciej Kisielewski <email address hidden>

Revision history for this message

Maciej Kisielewski (kissiel) wrote on 2016-10-05:

#

r.4520 fixes the failing test by unpacking (None, None) tuple and checking 'is not None' for both parts of the pair individually.

Checkbox

Merge lp://staging/~kissiel/checkbox/speed-optimization into lp://staging/checkbox

Commit message

Description of the change

Preview Diff

Subscribers