Skip to content
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.

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

[20.03] linux: really remove 5.5 #85845

Merged
merged 1 commit into from Apr 23, 2020
Merged

Conversation

@cole-h
Copy link
Member

cole-h commented Apr 23, 2020

5.5 was removed in aa7c5b0,
but this attribute was missed, leading to an evaluation failure for the
nixos-20.03-small channel.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @NeQuissimus: Hope I've done this right. I don't think this would need to be forward-ported, but let me know.

https://nix-cache.s3.amazonaws.com/log/i9vglf7w5z13w0d6cya5w623xmvzgdr3-nixos-channel-20.03.1502.d72fcc568d2.drv

5.5 was removed in aa7c5b0,
but this attribute was missed, leading to an evaluation failure for the
nixos-20.03-small channel.
@samueldr
Copy link
Member

samueldr commented Apr 23, 2020

Correct, @cole-h, this is something that isn't dont the same way for stable vs. unstable releases.

@samueldr
Copy link
Member

samueldr commented Apr 23, 2020

I verified locally with the ofborg evaluator, the failure is the release branch failing to eval.

I ran the following on the tip of both branches:

.../ofborg/ofborg/src/outpaths.nix

And this indeed fixes it.

Thank you!

@samueldr samueldr merged commit c23427d into NixOS:release-20.03 Apr 23, 2020
1 check failed
1 check failed
grahamcofborg-eval The branch this PR will merge in to does not cleanly evaluate, and so this PR cannot be checked.
Details
@NeQuissimus
Copy link
Member

NeQuissimus commented Apr 23, 2020

Oops, my bad!

@cole-h cole-h deleted the cole-h:linux-remove-5.5 branch Apr 23, 2020
@samueldr
Copy link
Member

samueldr commented Apr 23, 2020

@NeQuissimus can I propose you add running the (quick) ofborg evaluator as part of your release process?

I'm assuming it's somewhat automated.

This nix expression:

Can be run like a script (wild!)

Assuming you end up running some tests at the end of your changes, you could run .../ofborg/src/outpaths.nix at the end. It would have failed in this instance.

No one would end up knowing if you don't or can't, though now you know it's a possibility 🙂 .

@NeQuissimus
Copy link
Member

NeQuissimus commented Apr 23, 2020

Roger that :D I really do need to automate these things...

Edit: That script runs out of memory after about 2 minutes every time I run it oO

upstream_nix on  master λ ../outpaths.nix
[1]    29451 killed     ../outpaths.nix

journalctl -xe:

Apr 23 16:28:29 nixus kernel: oom-kill:constraint=CONSTRAINT_NONE,nodemask=(null),cpuset=/,mems_allowed=0,global_oom,task_memcg=/user.slice/user-1000.slice/session-2.scope,task=nix-env,pid=29451,uid=1000
Apr 23 16:28:29 nixus kernel: Out of memory: Killed process 29451 (nix-env) total-vm:6640104kB, anon-rss:6563432kB, file-rss:4kB, shmem-rss:0kB, UID:1000 pgtables:12956kB oom_score_adj:0
Apr 23 16:28:30 nixus kernel: oom_reaper: reaped process 29451 (nix-env), now anon-rss:0kB, file-rss:0kB, shmem-rss:0kB
@samueldr
Copy link
Member

samueldr commented Apr 23, 2020

Looks like it's around 6.3GiB "total-vm", I'm never confident with those numbers and how they map to actual RAM use.

Let's run it locally:

TIME=\n → exit status: %x\n → user: %U, system: %S, elapsed: %E\n → cpu: %P, max mem: %M, avg mem: %t, unshared: %D\n → I/O: <I:%I O:%O>, sock: <r:%r s:%s>

.../nixpkgs/nixos-20.03 $ time ~/tmp/ofborg/ofborg/src/outpaths.nix --show-trace
...
 → exit status: 0
 → user: 226.35, system: 6.38, elapsed: 8:01.42
 → cpu: 48%, max mem: 21833600, avg mem: 0, unshared: 0
 → I/O: <I:0 O:8>, sock: <r:0 s:0>

Ignore the time elapsed, as it was waiting on input in a less.

  %M   maximum resident set size in KB
irb(main):002:0> 21833600.0 / 1024 / 1024
=> 20.8221435546875

That explains it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.