Skip to content

addMultipleToStore(): Move pathsToCopy (backport #12296)#12300

Merged
edolstra merged 2 commits into
2.25-maintenancefrom
mergify/bp/2.25-maintenance/pr-12296
Jan 20, 2025
Merged

addMultipleToStore(): Move pathsToCopy (backport #12296)#12300
edolstra merged 2 commits into
2.25-maintenancefrom
mergify/bp/2.25-maintenance/pr-12296

Conversation

@mergify

@mergify mergify Bot commented Jan 20, 2025

Copy link
Copy Markdown
Contributor

Motivation

This allows RemoteStore::addMultipleToStore() to free the Source objects early (and in particular the associated sinkToSource() buffers). This should fix #7359. For example, memory consumption of

$ nix copy --derivation --to ssh-ng://localhost?remote-store=/tmp/nix --derivation --no-check-sigs \
    /nix/store/4p9xmfgnvclqpii8pxqcwcvl9bxqy2xf-nixos-system-...drv

went from 353 MB to 74 MB.

This fix is an alternative to (or in addition to) #12255.

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #12296 done by [Mergify](https://mergify.com).

edolstra and others added 2 commits January 20, 2025 14:18
This allows RemoteStore::addMultipleToStore() to free the Source
objects early (and in particular the associated sinkToSource()
buffers). This should fix #7359. For example, memory consumption of

  nix copy --derivation --to ssh-ng://localhost?remote-store=/tmp/nix --derivation --no-check-sigs \
    /nix/store/4p9xmfgnvclqpii8pxqcwcvl9bxqy2xf-nixos-system-...drv

went from 353 MB to 74 MB.

(cherry picked from commit cc838e8)
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
(cherry picked from commit 2669e4a)
@mergify mergify Bot added the merge-queue label Jan 20, 2025
@mergify mergify Bot requested a review from Ericson2314 as a code owner January 20, 2025 14:18
@github-actions github-actions Bot added the store Issues and pull requests concerning the Nix store label Jan 20, 2025
@mergify

mergify Bot commented Jan 20, 2025

Copy link
Copy Markdown
Contributor Author

This pull request has been removed from the queue for the following reason: pull request dequeued.

Pull request #12300 has been dequeued. The pull request could not be merged. This could be related to an activated branch protection or ruleset rule that prevents us from merging. (detail: 2 of 4 required status checks are in progress.)

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

@edolstra edolstra merged commit c38234b into 2.25-maintenance Jan 20, 2025
@edolstra edolstra deleted the mergify/bp/2.25-maintenance/pr-12296 branch January 20, 2025 15:26
@roberth roberth added the automatic backport This PR is a backport produced by automation (does not trigger backporting) label Jan 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automatic backport This PR is a backport produced by automation (does not trigger backporting) merge-queue store Issues and pull requests concerning the Nix store

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants