diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-14T14·34+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-14T14·38+0200 |
| commit | 6656ef7b5b798200cf8bf0c7534dbad1e964444d (patch) | |
| tree | 619ed90d405e78f8d9aade15c988a6625f64e5d6 | |
| parent | 90ad02bf626b885a5dd8967894e2eafc953bdf92 (diff) | |
Revive binary-caches-parallel-connections
It's a slight misnomer now because it actually limits *all* downloads, not just binary cache lookups. Also add a "enable-http2" option to allow disabling use of HTTP/2 (enabled by default).
| -rw-r--r-- | doc/manual/command-ref/conf-file.xml | 7 | ||||
| -rw-r--r-- | src/libstore/download.cc | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml index fb7bdf573397..8b7640e58292 100644 --- a/doc/manual/command-ref/conf-file.xml +++ b/doc/manual/command-ref/conf-file.xml @@ -408,10 +408,9 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para> <varlistentry><term><literal>binary-caches-parallel-connections</literal></term> - <listitem><para>The maximum number of parallel HTTP connections - used by the binary cache substituter to get NAR info files. This - number should be high to minimise latency. It defaults to - 25.</para></listitem> + <listitem><para>The maximum number of parallel TCP connections + used to fetch files from binary caches and by other downloads. It + defaults to 25. 0 means no limit.</para></listitem> </varlistentry> diff --git a/src/libstore/download.cc b/src/libstore/download.cc index 2aca0a975bfe..b2d223da960a 100644 --- a/src/libstore/download.cc +++ b/src/libstore/download.cc @@ -40,6 +40,8 @@ struct CurlDownloader : public Downloader std::random_device rd; std::mt19937 mt19937; + bool enableHttp2; + struct DownloadItem : public std::enable_shared_from_this<DownloadItem> { CurlDownloader & downloader; @@ -185,7 +187,8 @@ struct CurlDownloader : public Downloader curl_easy_setopt(req, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(req, CURLOPT_USERAGENT, ("Nix/" + nixVersion).c_str()); curl_easy_setopt(req, CURLOPT_PIPEWAIT, 1); - curl_easy_setopt(req, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS); + if (downloader.enableHttp2) + curl_easy_setopt(req, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS); curl_easy_setopt(req, CURLOPT_WRITEFUNCTION, DownloadItem::writeCallbackWrapper); curl_easy_setopt(req, CURLOPT_WRITEDATA, this); curl_easy_setopt(req, CURLOPT_HEADERFUNCTION, DownloadItem::headerCallbackWrapper); @@ -291,7 +294,10 @@ struct CurlDownloader : public Downloader curlm = curl_multi_init(); curl_multi_setopt(curlm, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX); - curl_multi_setopt(curlm, CURLMOPT_MAX_TOTAL_CONNECTIONS, 25); // FIXME: configurable + curl_multi_setopt(curlm, CURLMOPT_MAX_TOTAL_CONNECTIONS, + settings.get("binary-caches-parallel-connections", 25)); + + enableHttp2 = settings.get("enable-http2", true); wakeupPipe.create(); fcntl(wakeupPipe.readSide.get(), F_SETFL, O_NONBLOCK); |