Shepherd 0.8.1 tests fail on core-updates

Léo Le Bouter wrote on 15 Mar 19:51 +0100

GNU Shepherd 0.8.1 fails on core-updates

Recipients:(address . bug-guix@gnu.org)

Message-ID:37305bfa08faea95b45a6496623154c2ebab1f11.camel@zaclys.net

Some tests fail:
FAIL: tests/no-home.shFAIL: tests/status-sexp.shPASS: tests/misbehaved-client.shFAIL: tests/replacement.shPASS: tests/file-creation-mask.shPASS: tests/restart.shPASS: tests/one-shot.shFAIL: tests/basic.shPASS: tests/respawn-throttling.shPASS: tests/signals.shPASS: tests/respawn.shPASS: tests/forking-service.shPASS: tests/pid-file.sh
Attached bzip2 compressed full log

Attachment: 3qhfxagkqrx96xci8ylc4lj3s4zvd2-shepherd-0.8.1.drv.bz2

Ludovic Courtès wrote on 23 Mar 16:11 +0100

control message for bug #47172

Recipients:(address . control@debbugs.gnu.org)

Message-ID:877dlxj45u.fsf@gnu.org

retitle 47172 Shepherd 0.8.1 tests fail on core-updatesquit

Léo Le Bouter wrote on 24 Mar 14:25 +0100

Re: bug#47172: GNU Shepherd 0.8.1 fails on core-updates

Recipients:(address . 47172@debbugs.gnu.org)

Message-ID:80954a930aa5ea8d71e472be49a6ea118e7ba2a7.camel@zaclys.net

It seems this is due to guile 3.0.5, GNU Shepherd 0.8.1 does not workwith it, it works with guile 3.0.2 however.
Thanks to Efraim on IRC for hints.
It would be great if people knowledgeable with Scheme, GNU Shepherd andGuile could fix it, it blocks GNOME upgrade work on top of core-updates.

Ludovic Courtès wrote on 23 May 12:23 +0200

control message for bug #47172

Recipients:(address . control@debbugs.gnu.org)

Message-ID:8735ud696b.fsf@gnu.org

severity 47172 importantquit

Ludovic Courtès wrote on 23 May 12:25 +0200

Re: bug#47172: Shepherd 0.8.1 tests fail on core-updates

Recipients:(address . 47172@debbugs.gnu.org)

Message-ID:87zgwl4ui0.fsf@gnu.org

Hi there,
Léo Le Bouter <lle-bout@zaclys.net> skribis:

Toggle quote (6 lines)

> Some tests fail:>> FAIL: tests/no-home.sh> FAIL: tests/status-sexp.sh> PASS: tests/misbehaved-client.sh

[...]

Toggle quote (3 lines)

> It seems this is due to guile 3.0.5, GNU Shepherd 0.8.1 does not work> with it, it works with guile 3.0.2 however.

This turns out to be due to a… miscompilation bug.
In (shepherd scripts herd), ‘run-command’ has this code:
(let ((sock (open-connection socket-file)) (action* (if (and (eq? action 'detailed-status) (memq service '(root shepherd))) 'status action))) …)
Problem is that everything works as if (eq? action 'detailed-status)was omitted, such that ‘herd stop root’ is interpreted as ‘herd statusroot’.
Simply wrapping the condition in (pk …) “fixes” the problem.
The peval output looks good (it contains the 'detailed-statuscomparison), but the assembly seems to lack the 'detailed-statuscomparison altogether:

Toggle snippet (51 lines)Disassembly of <unnamed function> at #x29e0:
   0    (instrument-entry 15700)                              at shepherd/scripts/herd.scm:127:2   2    (assert-nargs-ee/locals 1 11)   ;; 12 slots (0 args)   3    (static-ref 10 15369)           ;; #f                 at shepherd/scripts/herd.scm:128:19   5    (immediate-tag=? 10 7 0)        ;; heap-object?   7    (je 9)                          ;; -> L1   8    (static-ref 10 14166)           ;; #f  10    (static-ref 9 15372)            ;; open-connection  12    (call-scm<-scm-scm 10 10 9 111)   14    (static-set! 10 15358)          ;; #fL1:  16    (scm-ref/immediate 7 10 1)        17    (scm-ref/immediate 6 11 2)        18    (handle-interrupts)                                   at shepherd/scripts/herd.scm:128:18  19    (call 4 2)                        21    (receive 1 4 12)                  23    (scm-ref/immediate 9 11 3)        24    (static-ref 8 15360)            ;; #f                 at shepherd/scripts/herd.scm:134:6  26    (immediate-tag=? 8 7 0)         ;; heap-object?  28    (je 9)                          ;; -> L2  29    (static-ref 8 14145)            ;; #f  31    (static-ref 7 15363)            ;; write-command  33    (call-scm<-scm-scm 8 8 7 111)     35    (static-set! 8 15349)           ;; #fL2:  37    (scm-ref/immediate 8 8 1)         38    (static-ref 7 15358)            ;; #f                 at shepherd/scripts/herd.scm:134:21  40    (immediate-tag=? 7 7 0)         ;; heap-object?  42    (je 9)                          ;; -> L3  43    (static-ref 7 14131)            ;; #f  45    (static-ref 6 15361)            ;; shepherd-command  47    (call-scm<-scm-scm 7 7 6 111)     49    (static-set! 7 15347)           ;; #fL3:  51    (scm-ref/immediate 7 7 1)         52    (scm-ref/immediate 6 11 4)        53    (static-ref 5 15363)            ;; root  55    (eq? 6 5)                         56    (je 5)                          ;; -> L4  57    (static-ref 5 13655)            ;; shepherd  59    (eq? 6 5)                         60    (jne 3)                         ;; -> L5L4:  61    (static-ref 9 15365)            ;; status             at shepherd/scripts/herd.scm:131:22L5:  63    (static-ref 1 15375)            ;; #:arguments        at shepherd/scripts/herd.scm:134:54  65    (scm-ref/immediate 0 11 5)        66    (mov 4 7)                                             at shepherd/scripts/herd.scm:134:20

(This is compiled with 3.0.7 and the default optimizations, so -O2.)
To be continued…
Ludo’.

Ludovic Courtès wrote on 23 May 15:49 +0200

Recipients:(address . 47172@debbugs.gnu.org)

Message-ID:87v9794l2a.fsf@gnu.org

Ludovic Courtès <ludo@gnu.org> skribis:

Toggle quote (15 lines)> This turns out to be due to a… miscompilation bug.>> In (shepherd scripts herd), ‘run-command’ has this code:>>   (let ((sock    (open-connection socket-file))>         (action* (if (and (eq? action 'detailed-status)>                           (memq service '(root shepherd)))>                      'status>                      action)))>     …)>> Problem is that everything works as if (eq? action 'detailed-status)> was omitted, such that ‘herd stop root’ is interpreted as ‘herd status> root’.

A workaround that works with 3.0.7 is swapping the two ‘and’sub-expressions:

Toggle diff (15 lines)diff --git a/modules/shepherd/scripts/herd.scm b/modules/shepherd/scripts/herd.scmindex 106de1e..39d2e34 100644--- a/modules/shepherd/scripts/herd.scm+++ b/modules/shepherd/scripts/herd.scm@@ -126,8 +126,8 @@ of pairs." the daemon via SOCKET-FILE."   (with-system-error-handling    (let ((sock    (open-connection socket-file))-         (action* (if (and (eq? action 'detailed-status)-                           (memq service '(root shepherd)))+         (action* (if (and (memq service '(root shepherd))+                           (eq? action 'detailed-status))                       'status                       action)))      ;; Send the command.

Ludo’.

Marius Bakke wrote on 23 May 17:23 +0200

Recipients:(address . 48368@debbugs.gnu.org)

Message-ID:875yz9qxrv.fsf@gnu.org

Ludovic Courtès <ludo@gnu.org> skriver:

Toggle quote (36 lines)> Ludovic Courtès <ludo@gnu.org> skribis:>>> This turns out to be due to a… miscompilation bug.>>>> In (shepherd scripts herd), ‘run-command’ has this code:>>>>   (let ((sock    (open-connection socket-file))>>         (action* (if (and (eq? action 'detailed-status)>>                           (memq service '(root shepherd)))>>                      'status>>                      action)))>>     …)>>>> Problem is that everything works as if (eq? action 'detailed-status)>> was omitted, such that ‘herd stop root’ is interpreted as ‘herd status>> root’.>> A workaround that works with 3.0.7 is swapping the two ‘and’> sub-expressions:>> diff --git a/modules/shepherd/scripts/herd.scm b/modules/shepherd/scripts/herd.scm> index 106de1e..39d2e34 100644> --- a/modules/shepherd/scripts/herd.scm> +++ b/modules/shepherd/scripts/herd.scm> @@ -126,8 +126,8 @@ of pairs.">  the daemon via SOCKET-FILE.">    (with-system-error-handling>     (let ((sock    (open-connection socket-file))> -         (action* (if (and (eq? action 'detailed-status)> -                           (memq service '(root shepherd)))> +         (action* (if (and (memq service '(root shepherd))> +                           (eq? action 'detailed-status))>                        'status>                        action)))>       ;; Send the command.

Cc'ing the relevant Guile bug:
https://bugs.gnu.org/48368
See also commit 79be6a985799adc6d663890250f4fb7c12f015b4 on'core-updates' that builds with -O1 as a less satisfactory workaround.

Ludovic Courtès wrote on 23 May 23:43 +0200

Recipients:(name . Marius Bakke)(address . marius@gnu.org)

Message-ID:87lf853z4i.fsf@gnu.org

Hello,
Marius Bakke <marius@gnu.org> skribis:

Toggle quote (2 lines)

> Ludovic Courtès <ludo@gnu.org> skriver:

[...]

Toggle quote (23 lines)>> A workaround that works with 3.0.7 is swapping the two ‘and’>> sub-expressions:>>>> diff --git a/modules/shepherd/scripts/herd.scm b/modules/shepherd/scripts/herd.scm>> index 106de1e..39d2e34 100644>> --- a/modules/shepherd/scripts/herd.scm>> +++ b/modules/shepherd/scripts/herd.scm>> @@ -126,8 +126,8 @@ of pairs.">>  the daemon via SOCKET-FILE.">>    (with-system-error-handling>>     (let ((sock    (open-connection socket-file))>> -         (action* (if (and (eq? action 'detailed-status)>> -                           (memq service '(root shepherd)))>> +         (action* (if (and (memq service '(root shepherd))>> +                           (eq? action 'detailed-status))>>                        'status>>                        action)))>>       ;; Send the command.>> Cc'ing the relevant Guile bug:>>   https://bugs.gnu.org/48368

Oh nice! (It would have saved me a bit of time to catch up on emailbeforehand. :-))

Toggle quote (3 lines)

> See also commit 79be6a985799adc6d663890250f4fb7c12f015b4 on> 'core-updates' that builds with -O1 as a less satisfactory workaround.

I found that ‘-O2 -Ono-resolve-primitives’ also does the trick.
If we manually replace ‘memq’ by two ‘eq?’ tests (which is what thecompiler does), the same problem is exhibited:

Toggle diff (14 lines)diff --git a/modules/shepherd/scripts/herd.scm b/modules/shepherd/scripts/herd.scmindex 106de1e..513508f 100644--- a/modules/shepherd/scripts/herd.scm+++ b/modules/shepherd/scripts/herd.scm@@ -127,7 +127,8 @@ the daemon via SOCKET-FILE."   (with-system-error-handling    (let ((sock    (open-connection socket-file))          (action* (if (and (eq? action 'detailed-status)-                           (memq service '(root shepherd)))+                           (or (eq? service 'root)+                               (eq? service 'shepherd)))                       'status                       action)))      ;; Send the command.

‘-Ono-resolve-primitives’ also helps in this case.
‘-Ono-optimize-branch-chains’ has no effect.
So, not much progress, but at least we have a workaround.
Thanks,Ludo’.

Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send email to 47172@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date