Commit Graph

475 Commits

Author SHA1 Message Date
Ludovic Courtès 1f31134d33 database: Make 'db-add-derivation' idempotent.
* src/cuirass/database.scm (db-add-derivation): Catch 'sqlite-error and
handle SQLITE_CONSTRAINT_PRIMARYKEY.
(SQLITE_CONSTRAINT_UNIQUE): New variable.
* tests/database.scm ("database")["db-add-derivation"]: Add extra call to
'db-add-derivation'.
2018-02-14 16:41:50 +01:00
Ludovic Courtès c47dfdf82b http: Process client connections really concurrently.
Before that, 'run-server' would force sequential processing of client
requests one after another.

* src/cuirass/http.scm (run-cuirass-server): Rewrite to use its own loop
instead of 'run-server'.
2018-02-10 00:12:06 +01:00
Ludovic Courtès ef3801b3cc utils: 'non-blocking' forwards exceptions to the calling fiber.
* src/cuirass/utils.scm (%non-blocking): Forward exceptions to the
calling fiber.
2018-02-08 18:46:46 +01:00
Ludovic Courtès 8c7c93922b database: Use argument binding in 'db-get-builds' queries.
That makes it safe from SQL injection.

* src/cuirass/database.scm (db-get-builds): Rewrite to use question
marks in SQL queries and binding through '%sqlite-exec'.
* tests/database.scm ("database")["db-get-builds"]: Exercise 'WHERE'
clauses.
2018-02-08 18:45:03 +01:00
Ludovic Courtès b0c39b31f6 database: Handle binding directly in 'sqlite-exec'.
The new macro automatically takes care of inserting question marks in
the SQL queries, which in turn guarantees that there are always as many
question marks and arguments.

* src/cuirass/database.scm (sqlite-exec): Rename to...
(%sqlite-exec): ... this.
(sqlite-exec/bind, sqlite-exec): New macros.
(assq-refs): Remove.
(db-add-specification): Use the new 'sqlite-exec' form.
(db-get-specifications): Correctly deal with REV or TAG being #f.
(db-add-derivation, db-get-derivation, db-add-evaluation)
(db-add-build, db-update-build-status!, db-get-outputs)
(db-get-build, db-get-stamp, db-add-stamp): Adjust to the new
'sqlite-exec' form.
2018-02-08 17:35:32 +01:00
Ludovic Courtès 5425639271 examples: random: Make derivations a bit more random.
* examples/random-jobs.scm (random-derivation): Tweak the computation of
SEED.  Actually use the new random state.
2018-02-08 14:19:19 +01:00
Ludovic Courtès 57410b6cc2 base: Account for derivations built behind our back.
Previously any derivation not directly built by Cuirass would be
considered as failed because 'handle-build-event' wouldn't see any build
event.  Here we just make sure the build status recorded in the database
corresponds to reality.

* src/cuirass/base.scm (update-build-statuses!): New procedure.
(spawn-builds): Call it after 'build-derivations&'.
2018-02-08 14:19:19 +01:00
Ludovic Courtès 49ec76487a base: Fix computation of build success/failure.
* src/cuirass/base.scm (build-packages)[register]: Make 'db-add-build' a
tail call.
Fix computation of 'outs'.
2018-02-08 14:19:19 +01:00
Ludovic Courtès 5d60d9c4eb examples: random: Make the job name a symbol.
* examples/random-jobs.scm (make-job): Add '.' in #:job-name.
2018-02-08 14:19:19 +01:00
Ludovic Courtès 2887b1dfa9 database: 'db-update-build-status!' keeps stoptime unchanged when nothing new.
* src/cuirass/database.scm (db-update-build-status!): And "AND status != ?"
in SQL queries.
* tests/database.scm ("database")["db-update-build-status!"]: Add call
to 'db-update-build-status!'.
2018-02-08 14:19:19 +01:00
Ludovic Courtès 0ff3c23274 base: Explicitly enable #:print-build-trace.
This is purely "defensive programming" since the default value for
'print-build-trace' is currently #t.

* src/cuirass/base.scm (with-store): Pass #:print-build-trace to
'set-build-options'.
2018-02-08 14:19:19 +01:00
Ludovic Courtès 53fcecd25f database: Cache prepared statements.
Suggested by Danny Milosavljevic.

* src/cuirass/database.scm (sqlite-exec): Pass #:cache? to
'sqlite-prepare'.
2018-02-08 14:19:19 +01:00
Danny Milosavljevic eb01f46987 database: Use 'sqlite-bind' to avoid SQL injection.
* src/cuirass/database.scm (%sqlite-exec): Remove.
(sqlite-exec): Turn back into a procedure.  Use 'sqlite-bind'.  Add
'normalize' procedure and use it.
(db-add-specification, db-add-derivation, db-get-derivation)
(db-add-evaluation, db-add-build, db-update-build-status!)
(db-get-build, db-get-stamp, db-add-stamp): Use question marks in SQL
queries.
* src/cuirass/base.scm (build-packages)[register]: Make #:log
non-false.
* tests/database.scm (make-dummy-job): Add #:job-name, #:system,
 #:nix-name, and #:eval-id.  This is necessary because 'sqlite-bind'
would now translate #f to a real NULL (before it would translate to the
string "#f"...), and would thus report violations of the non-NULL
constraint.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
2018-02-08 14:18:27 +01:00
Ludovic Courtès e656f42571 base: Remove useless 'log-message' calls.
* src/cuirass/base.scm (build-packages): Remove useless 'log-message'
calls.
2018-02-05 23:01:26 +01:00
Ludovic Courtès dd75b5bec9 http: /jobsets returns a list of jobsets.
Reported by Danny Milosavljevic.

* src/cuirass/http.scm (url-handler) <"jobsets"> Return the result of
'db-get-specifications' as-is, not just the car.
2018-02-05 23:01:26 +01:00
Ludovic Courtès e5220dbed3 base: Log the number of builds performed.
* src/cuirass/base.scm (spawn-builds): Log the number of builds
performed, not the number of remaining builds.
2018-02-05 23:01:26 +01:00
Ludovic Courtès a3025cad92 cuirass: Add '--threads' and put an upper bound on the default.
* bin/cuirass.in (show-help, %options): Add "--threads".
(main): Honor it.  Pass #:parallelism to 'run-fibers'.
2018-02-05 23:01:24 +01:00
Ludovic Courtès 161d6abef8 base: Work around Fibers I/O scheduling bug.
Works around <https://github.com/wingo/fibers/issues/19>.

The effect in practice would be that we'd usually not reach the
'close-pipe' call in 'evaluate', leaving zombie processes behind us,
never executing the continuation, and additionally spinning fast on a
sequence of epoll_wait/epoll_ctl calls.

* src/cuirass/base.scm <top level>: Monkey-patch (fibers internal).
2018-01-30 23:58:47 +01:00
Ludovic Courtès eb9521d1b4 examples: Add 'random-jobs'.
* examples/random-jobs.scm, examples/random.scm: New files.
* Makefile.am (nobase_dist_pkgdata_DATA): Add them.
2018-01-29 22:42:12 +01:00
Ludovic Courtès e0588239d2 base: Make build log processing non-blocking.
We used to have 'build-derivations' write to the custom binary port
returned by 'build-event-output-port'.  However, custom binary ports
constitute continuation barriers, thereby preventing fibers from being
suspended.

To make build log processing non-blocking, we therefore invert this
inversion of control and use a suspendable I/O procedure,
'read-line/non-blocking', when reading the build log.

* src/cuirass/base.scm (read-line/non-blocking, process-build-log)
(build-derivations&): New procedures.
(%newline, build-event-output-port): Remove.
(spawn-builds): Use 'build-derivations&' instead of 'build-derivations'
with 'build-event-output-port'.
2018-01-29 18:06:47 +01:00
Ludovic Courtès 0bf61ef1ff http: Evaluate DB requests in 'non-blocking'.
* src/cuirass/http.scm (handle-builds-request): Wrap 'db-get-builds'
into 'non-blocking'.
2018-01-29 18:06:47 +01:00
Ludovic Courtès 23fecf8f3d cuirass: Log resource usage statistics regularly.
* src/cuirass/logging.scm (log-monitoring-stats): New procedure.
* bin/cuirass.in (main): Add a fiber that calls it regularly.
2018-01-29 18:06:47 +01:00
Ludovic Courtès fcd1bc13bc http: /api/queue returns builds sorted by status.
* src/cuirass/database.scm (db-get-builds)[format-order-clause]: Add
'status+submission-time'.
* src/cuirass/http.scm (url-handler) <"queue">: Use it.
2018-01-29 18:06:47 +01:00
Ludovic Courtès 5e959dd8f2 base: 'spawn-builds' shuffles jobs.
* src/cuirass/base.scm (shuffle-jobs): New procedure.
(spawn-builds): Use it.
2018-01-29 18:06:47 +01:00
Ludovic Courtès 1e539e10cc base: 'spawn-builds' logs the beginning of each new batch.
* src/cuirass/base.scm (spawn-builds): Add 'log-message' call.
2018-01-29 18:06:47 +01:00
Danny Milosavljevic 12061356d9
build-aux: Add guile-fibers.
* build-aux/guix.scm (inputs): Add guile-fibers.
2018-01-29 17:13:57 +01:00
Danny Milosavljevic 25f1db8da2
examples: Use new API.
* examples/guix-track-git.scm (package->git-tracked): Add STORE parameter.
(guix-jobs): Pass value for STORE parameter.
2018-01-29 16:26:35 +01:00
Ludovic Courtès a8c2a8fda6 cuirass: Place web server fiber on its own core.
* bin/cuirass.in (main): Pass #:parallel? to 'spawn-fiber' for the web
server.
2018-01-27 19:31:06 +01:00
Ludovic Courtès 0098e613db cuirass: Add 'essential-task' and wrap the main fibers in it.
* src/cuirass/utils.scm (essential-task): New procedure.
* bin/cuirass.in (main): Wrap each fiber in 'essential-task'.
2018-01-27 16:04:31 +01:00
Ludovic Courtès 4558d1c869 http: Reject methods other than GET.
* src/cuirass/http.scm (url-handler): Check whether REQUEST's method is
'GET, and return 405 if not.
2018-01-26 22:41:22 +01:00
Ludovic Courtès 8b26874cac http: Provide the correct values for 'finished' and 'busy'.
This should placate 'guix-hydra-queued-builds', for instance, which
checks these values to choose between "Running" and "Scheduled".

* src/cuirass/http.scm (build->hydra-build): Provide the correct value
for #:finished and #:busy.
2018-01-26 18:28:32 +01:00
Ludovic Courtès f3335e880c database: Open the database in "write-ahead log" mode.
Suggested by Ricardo Wurmus.

* src/cuirass/database.scm (wal-mode): New procedure.
(db-open): Use it.
2018-01-26 18:21:56 +01:00
Ludovic Courtès e11bcf926d base: 'build-event-output-port' no longer reads past the buffer.
Fixes a bug whereby 'build-event-output-port' would sometimes read more
than COUNT from BV, which would usually result in a 'decoding-error'
exception from 'utf8->string'.

* src/cuirass/base.scm (build-event-output-port)[write!]: Use
'bytevector-range' to honor COUNT and OFFSET.
2018-01-26 15:56:40 +01:00
Ludovic Courtès 777ef99dd7 utils: Add 'bytevector-range'.
* src/cuirass/utils.scm (%weak-references): New variable.
(bytevector-range): New procedure.
2018-01-26 15:56:12 +01:00
Ludovic Courtès 39cf6e6ed0 base: Make repository fetching and compilation non-blocking.
Previously these calls would effectively suspend execution of all the
fibers until they had completed.

* src/cuirass/base.scm (process-specs): Wrap 'fetch-repository' and
'compile' calls in 'non-blocking'.
2018-01-26 14:43:48 +01:00
Ludovic Courtès 8d44590099 utils: Add 'non-blocking' macro.
* src/cuirass/utils.scm (%non-blocking): New procedure.
(non-blocking): New macro.
2018-01-26 14:43:29 +01:00
Ludovic Courtès ced26b6012 cuirass: Reduce Fiber's tick rate.
* bin/cuirass.in (main): Pass #:hz to 'run-fibers'.
2018-01-26 14:37:22 +01:00
Ludovic Courtès dd8b6f66e4 cuirass: Catch exceptions in the main fiber and stop everything.
* bin/cuirass.in (main): Add 'exit-channel' and read from it.
Catch exceptions in the main fiber and write to that channel upon
error.
2018-01-26 14:34:27 +01:00
Ludovic Courtès 5d559f8021 logging: Add 'with-time-logging' and use it.
* src/cuirass/logging.scm (call-with-time-logging): New procedure.
(with-time-logging): New macro.
* src/cuirass/http.scm (handle-builds-request): Use it.
2018-01-26 14:17:18 +01:00
Ludovic Courtès 255e281a0c cuirass: Log pending build request.
* bin/cuirass.in (main): Print message while fetching pending builds.
2018-01-26 14:09:47 +01:00
Ludovic Courtès e98c4f0b04 http: Run test within 'run-fibers'.
* tests/http.scm ("http")["cuirass-run"]: Run server with 'run-fibers'.
2018-01-26 14:07:09 +01:00
Ludovic Courtès 44f95d407c base: Do not restart builds that turn out to have succeeded already.
* src/cuirass/base.scm (restart-builds): Mark as succeeded the subset of
VALID with at least one valid output.
2018-01-26 14:06:09 +01:00
Ludovic Courtès 047e927126 base: Do not pass bogus store file names to 'db-update-build-status!'.
* src/cuirass/base.scm (handle-build-event)[valid?]: New procedure.
Use it when handling 'build-started', 'build-succeeded', and
'build-failed' events.
2018-01-26 14:04:41 +01:00
Ludovic Courtès 1af31c3200 http: Log incoming connections and requests.
* src/web/server/fiberized.scm (socket-loop): Add 'log-message' call.
* src/cuirass/http.scm (url-handler): Likewise.
2018-01-26 11:23:07 +01:00
Ludovic Courtès 77769c29e7 http: Use our own 'fiberized' web server backend.
* src/web/server/fiberized.scm: New file.
* Makefile.am (dist_pkgmodule_DATA): Add it.
* src/cuirass/http.scm (run-cuirass-server): Use it.
2018-01-25 11:54:40 +01:00
Ludovic Courtès c2cbee8b4f base: Delete duplicate builds when restarting them.
* src/cuirass/base.scm (build-derivation=?): New procedure.
(restart-builds): Call 'delete-duplicates' on BUILDS.
2018-01-25 11:31:06 +01:00
Ludovic Courtès 71fb7eac92 base: Remove unneeded import.
* src/cuirass/base.scm: Remove unneeded #:use-module.
2018-01-25 10:41:37 +01:00
Ludovic Courtès a97665672a http: Sort /api/latestbuilds and /api/queue by time.
* src/cuirass/database.scm (db-get-builds)[format-order-clause]: Add
'order' clauses.
* src/cuirass/http.scm (url-handler): Default to (order finish-time) for
/latestbuilds and (order submission-time) for /queue.
2018-01-25 10:39:18 +01:00
Ludovic Courtès c4963deca1 database: Turn 'sqlite-exec' into a macro.
* src/cuirass/database.scm (%sqlite-exec): New procedure.
(sqlite-exec): New macro.
2018-01-25 10:38:53 +01:00
Ludovic Courtès 49a341866a base: Build derivations in batches.
This works around a scalability issue in guix-daemon when passing a long
list of derivations to 'build-derivations'.

* src/cuirass/base.scm (spawn-builds): New procedure.
(restart-builds, build-packages): Use it.
2018-01-25 10:36:24 +01:00