Re: 05/05: store: Default to a non-empty list of substituters.

Re: 05/05: store: Default to a non-empty list of substituters.

[Mark H Weaver]

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

> commit 4d58122071bbd7bb56c9658a9bbe7621bf3e423d
> Author: Ludovic Courtès <ludo@gnu.org>
> Date:   Sun Mar 22 23:43:25 2015 +0100
>
>     store: Default to a non-empty list of substituters.
>     
>     Fixes <http://bugs.gnu.org/20163>.
>     Reported by Mark H Weaver <mhw@netris.org>.
>     
>     * guix/store.scm (%default-substitute-urls): New variable.
>       (set-build-options): Change default value of #:substitute-urls to
>       %DEFAULT-SUBSTITUTE-URLS.
> ---
>  guix/store.scm |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)
>
> diff --git a/guix/store.scm b/guix/store.scm
> index 45c555b..3d6b069 100644
> --- a/guix/store.scm
> +++ b/guix/store.scm
> @@ -447,6 +447,10 @@ encoding conversion errors."
>                                (message "invalid error code")
>                                (status   k))))))))
>  
> +(define %default-substitute-urls
> +  ;; Default list of substituters.
> +  '("http://hydra.gnu.org"))
> +
>  (define* (set-build-options server
>                              #:key keep-failed? keep-going? fallback?
>                              (verbosity 0)
> @@ -459,7 +463,12 @@ encoding conversion errors."
>                              (print-build-trace #t)
>                              (build-cores (current-processor-count))
>                              (use-substitutes? #t)
> -                            (substitute-urls '())) ; client "untrusted" cache URLs
> +
> +                            ;; Client-provided substitute URLs.  For
> +                            ;; unprivileged clients, these are considered
> +                            ;; "untrusted"; for root, they override the
> +                            ;; daemon's settings.
> +                            (substitute-urls %default-substitute-urls))

Does this mean that even if I've configured my daemon to use a different
set of substitute-urls, when I run 'guix' as root those settings will be
overridden?  That seems suboptimal.

We have a similar problem with the values of --cores and --max-jobs
passed to guix-daemon being ignored because they are always overridden
by our client.

How can we fix these so that the daemon's settings are used unless the
user specifically asks to override them in the client?

       Mark

Using the daemon’s default settings

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> commit 4d58122071bbd7bb56c9658a9bbe7621bf3e423d
>> Author: Ludovic Courtès <ludo@gnu.org>
>> Date:   Sun Mar 22 23:43:25 2015 +0100
>>
>>     store: Default to a non-empty list of substituters.
>>     
>>     Fixes <http://bugs.gnu.org/20163>.
>>     Reported by Mark H Weaver <mhw@netris.org>.
>>     
>>     * guix/store.scm (%default-substitute-urls): New variable.
>>       (set-build-options): Change default value of #:substitute-urls to
>>       %DEFAULT-SUBSTITUTE-URLS.

[...]

> Does this mean that even if I've configured my daemon to use a different
> set of substitute-urls, when I run 'guix' as root those settings will be
> overridden?

Yes.

> That seems suboptimal.

Right.

> We have a similar problem with the values of --cores and --max-jobs
> passed to guix-daemon being ignored because they are always overridden
> by our client.

Indeed.

> How can we fix these so that the daemon's settings are used unless the
> user specifically asks to override them in the client?

If you look at nix-daemon.cc:543, there’s currently no way for a client
to say “default value.”  The only way for a client to get the daemon’s
default values is to not call the ‘set-build-options’ RPC at all; it’s
all or nothing.

I think the way forward would be to add a new RPC, say
‘set-build-options2’, that would take a list of key/value pairs, where
keys are option names.  Options not mentioned in a ‘set-build-options2’
call would keep their default value.

How does that sound?

Thanks,
Ludo’.

Re: Using the daemon’s default settings

[Mark H Weaver]

ludo@gnu.org (Ludovic Courtès) writes:

> Mark H Weaver <mhw@netris.org> skribis:
>
>> Does this mean that even if I've configured my daemon to use a different
>> set of substitute-urls, when I run 'guix' as root those settings will be
>> overridden?
>
> Yes.
>
>> That seems suboptimal.
>
> Right.
>
>> We have a similar problem with the values of --cores and --max-jobs
>> passed to guix-daemon being ignored because they are always overridden
>> by our client.
>
> Indeed.
>
>> How can we fix these so that the daemon's settings are used unless the
>> user specifically asks to override them in the client?
>
> If you look at nix-daemon.cc:543, there’s currently no way for a client
> to say “default value.”  The only way for a client to get the daemon’s
> default values is to not call the ‘set-build-options’ RPC at all; it’s
> all or nothing.

Ah, okay.

> I think the way forward would be to add a new RPC, say
> ‘set-build-options2’, that would take a list of key/value pairs, where
> keys are option names.  Options not mentioned in a ‘set-build-options2’
> call would keep their default value.
>
> How does that sound?

Sounds good to me!

    Thanks,
      Mark