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.

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

Jump to bottom

gitea: 1.12.6 -> 1.13.0 #105698

Merged
merged 2 commits into from Dec 2, 2020
Merged

gitea: 1.12.6 -> 1.13.0 #105698

merged 2 commits into from Dec 2, 2020

Conversation

aanderse
Copy link
Member

@aanderse aanderse commented Dec 2, 2020

Motivation for this change

https://github.com/go-gitea/gitea/releases/tag/v1.13.0

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.

@ofborg ofborg bot requested a review from disassembler December 2, 2020 14:09
@Ma27
Copy link
Member

Ma27 commented Dec 2, 2020

The test is currently failing:

server # [   62.356255] .gitea-wrapped invoked oom-killer: gfp_mask=0x100cca(GFP_HIGHUSER_MOVABLE), order=0, oom_score_adj=0
server # [   62.358627] CPU: 0 PID: 1033 Comm: .gitea-wrapped Not tainted 5.4.80 #1-NixOS
server # [   62.360311] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.13.0-48-gd9c812dda519-prebuilt.qemu.org 04/01/2014
server # [   62.363543] Call Trace:
server # [   62.364372]  dump_stack+0x66/0x90
server # [   62.365187]  dump_header+0x4a/0x1df
server # [   62.366036]  out_of_memory.cold+0xa/0x7e
server # [   62.366861]  __alloc_pages_slowpath+0xd0c/0xde0
server # [   62.367706]  __alloc_pages_nodemask+0x2cc/0x320
server # [   62.368663]  pagecache_get_page+0xb8/0x260
server # [   62.369598]  filemap_fault+0x434/0x8f0
server # [   62.370452]  ? alloc_set_pte+0x110/0x5b0
server # [   62.371577]  ? __switch_to_asm+0x34/0x70
server # [   62.372627]  ? filemap_map_pages+0x249/0x340
server # [   62.373596]  __do_fault+0x37/0x90
server # [   62.374411]  __handle_mm_fault+0xbf4/0x10f0
server # [   62.375366]  ? common_interrupt+0xa/0xf
server # [   62.376270]  handle_mm_fault+0xc4/0x1f0
server # [   62.377191]  do_user_addr_fault+0x1c4/0x440
server # [   62.378512]  async_page_fault+0x34/0x40
server # [   62.379527] RIP: 0033:0x43e340
server # [   62.380292] Code: Bad RIP value.
server # [   62.381513] RSP: 002b:00007f3538411cd0 EFLAGS: 00010202
server # [   62.382759] RAX: 0000000000000000 RBX: 000000c000001b00 RCX: 0000000000000001
server # [   62.384229] RDX: 000000000442d900 RSI: 0000000000000001 RDI: 0000000e4edf0683
server # [   62.385665] RBP: 00007f3538411ce8 R08: 0000000000000384 R09: 00007f3538411d18
server # [   62.387071] R10: 0000000000000000 R11: 0000000000000246 R12: 000000c000000900
server # [   62.389063] R13: 00007ffe7dca2eef R14: 0000000000000000 R15: 0000000000802000
server # [   62.390694] Mem-Info:
server # [   62.391163] active_anon:73797 inactive_anon:1136 isolated_anon:0
server # [   62.391163]  active_file:38 inactive_file:77 isolated_file:0
server # [   62.391163]  unevictable:0 dirty:0 writeback:0 unstable:0
server # [   62.391163]  slab_reclaimable:4205 slab_unreclaimable:4644
server # [   62.391163]  mapped:52 shmem:1222 pagetables:482 bounce:0
server # [   62.391163]  free:1178 free_pcp:0 free_cma:0
server # [   62.397291] Node 0 active_anon:295188kB inactive_anon:4544kB active_file:152kB inactive_file:308kB unevictable:0kB isolated(anon):0kB isolated(file):0kB mapped:208kB dirty:0kB writeback:0kB shmem:4888kB shmem_thp: 0kB shmem_pmdmapped: 0kB anon_thp: 0kB writeback_tmp:0kB unstable:0kB all_unreclaimable? no
server # [   62.403615] Node 0 DMA free:1404kB min:104kB low:128kB high:152kB active_anon:14260kB inactive_anon:0kB active_file:0kB inactive_file:0kB unevictable:0kB writepending:0kB present:15992kB managed:15908kB mlocked:0kB kernel_stack:0kB pagetables:32kB bounce:0kB free_pcp:0kB local_pcp:0kB free_cma:0kB

I think that this I've seen this in the past already. Currently checking if 2048 memorySize is sufficient.

@Ma27
nixos/tests/gitea: increase memory for VM
affb72e 
Otherwise, the relevant processes are stopped by the kernel's OOM
killer[1].

[1] NixOS#105698 (comment)
@Ma27
Copy link
Member

Ma27 commented Dec 2, 2020

Pushed a small patch that fixes the problem locally at least :)

@GrahamcOfBorg test gitea

@ofborg ofborg bot added the 6.topic: nixos label Dec 2, 2020
@Ma27
Copy link
Member

Ma27 commented Dec 2, 2020

Currently deploying gitea 1.13...

@Ma27 Ma27 merged commit 9714dd3 into NixOS:master Dec 2, 2020
@aanderse aanderse deleted the gitea branch December 2, 2020 14:56
@aanderse
Copy link
Member Author

aanderse commented Dec 2, 2020

Thank you very much @Ma27 🎉

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 105698 run on x86_64-darwin 1

1 package built:
  • gitea

@hmenke
Copy link
Member

hmenke commented Dec 13, 2020

Backport to 20.09? Gitea 1.13.0 contains some security fixes, so this might be desirable.

@Ma27
Copy link
Member

Ma27 commented Dec 16, 2020

Sounds reasonable. WDYT @aanderse ?

@aanderse
Copy link
Member Author

Yes and no. Yes, because security fixes. No, because upstream (and I guess us?) don't do a good enough job of explaining that gitea has no stable version. gitea major version updates can (and sometimes do) break your setup. Ideally I would keep the NixOS module on our stable branch, but remove the package and only have it in master... but that isn't how our repos work. So yes, we should port this to stable.

@Ma27
Copy link
Member

Ma27 commented Dec 16, 2020

Yeah, due to those security fixes this is the right thing to do.
FWIW I'm running gitea 1.13 for a week on 20.09 (cherry-picked it onto my personal deployment branch that tracks release-20.09) without any issues (update worked fine as well).

Ma27 added a commit that referenced this pull request Dec 16, 2020
@Ma27
nixos/tests/gitea: increase memory for VM
f05a0f2 
Otherwise, the relevant processes are stopped by the kernel's OOM
killer[1].

[1] #105698 (comment)

(cherry picked from commit affb72e)
@Ma27
Copy link
Member

Ma27 commented Dec 16, 2020

Ported to stable as 0c2df0c, f05a0f2.

@Ma27 Ma27 added the 8.has: port to stable A PR already has a backport to the stable release. label Dec 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 approved these changes

@srhb srhb Awaiting requested review from srhb

@kolaente kolaente Awaiting requested review from kolaente

@disassembler disassembler Awaiting requested review from disassembler

Assignees
No one assigned
Labels
6.topic: nixos 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@aanderse @Ma27 @SuperSandro2000 @hmenke