Skip to content

libstore/filetransfer: Fix double callback on enqueueFileTransfer that is shutting down #14838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mic92 merged 2 commits into from
Dec 26, 2025
Merged

libstore/filetransfer: Fix double callback on enqueueFileTransfer that is shutting down #14838

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6c1d56
libstore/filetransfer: Remove unused using namespace
xokdvium Dec 13, 2025
8104858
libstore/filetransfer: Fix double callback on enqueueFileTransfer tha…
xokdvium Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/libstore/filetransfer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#include <thread>
#include <regex>

using namespace std::string_literals;

namespace nix {

const unsigned int RETRY_TIME_MS_DEFAULT = 250;
Expand Down Expand Up @@ -77,8 +75,9 @@ struct curlFileTransfer : public FileTransfer
CURL * req = 0;
// buffer to accompany the `req` above
char errbuf[CURL_ERROR_SIZE];
bool active = false; // whether the handle has been added to the multi object
bool paused = false; // whether the request has been paused previously
bool active = false; // whether the handle has been added to the multi object
bool paused = false; // whether the request has been paused previously
bool enqueued = false; // whether the request has been added the incoming queue
std::string statusMsg;

unsigned int attempt = 0;
Expand Down Expand Up @@ -176,7 +175,7 @@ struct curlFileTransfer : public FileTransfer
curl_easy_cleanup(req);
}
try {
if (!done)
if (!done && enqueued)
fail(FileTransferError(
Interrupted, {}, "%s of '%s' was interrupted", Uncolored(request.noun()), request.uri));
} catch (...) {
Expand Down Expand Up @@ -887,6 +886,7 @@ struct curlFileTransfer : public FileTransfer
if (state->isQuitting())
throw nix::Error("cannot enqueue download request because the download thread is shutting down");
state->incoming.push(item);
item->enqueued = true; /* Now any exceptions should be reported via the callback. */
}

wakeupMulti();
Expand Down
Loading