forgejo/runner
Watch
39
105
Fork
You've already forked runner
 111
Code Issues 36 Pull requests 14 Releases 96 Packages 1 Activity Actions 2

fix: remove LXC working directory when it completes #1003

Merged
earl-warren merged 2 commits from earl-warren/runner:wip-lxc-leak into main 2025-09-16 19:42:04 +00:00
Conversation 4 Commits 2 Files changed 3 +24 -8
earl-warren commented 2025-09-16 10:38:04 +00:00
Contributor
Copy link
Copy Markdown

The working directory was not cleaned up upon completion of a LXC job because rc.stopJobContainer() -> rc.cleanUpJobContainer() -> rc.JobContainer.Remove() was never called for LXC containers.

  • stopContainer() and closeContainer() must not call
    rc.stopHostEnvironment(ctx) for LXC containers because
    • it will needlessly be called twice
    • it intercepts the call to
      • rc.stopJobContainer()
      • rc.JobContainer.Close()
  • rc.stopHostEnvironment(ctx) must be called in rc.cleanUpJobContainer which is indirectly called by rc.stopJobContainer()
  • since rc.JobContainer.Close() is a noop, not calling it for LXC containers had no consequence

Resolves forgejo/runner#442

  • bug fixes
    • PR: fix: remove LXC working directory when it completes
The working directory was not cleaned up upon completion of a LXC job because rc.stopJobContainer() -> rc.cleanUpJobContainer() -> rc.JobContainer.Remove() was never called for LXC containers. - stopContainer() and closeContainer() must not call rc.stopHostEnvironment(ctx) for LXC containers because - it will needlessly be called twice - it intercepts the call to - rc.stopJobContainer() - rc.JobContainer.Close() - rc.stopHostEnvironment(ctx) must be called in rc.cleanUpJobContainer which is indirectly called by rc.stopJobContainer() - since rc.JobContainer.Close() is a noop, not calling it for LXC containers had no consequence Resolves forgejo/runner#442 <!--start release-notes-assistant--> <!--URL:https://code.forgejo.org/forgejo/runner--> - bug fixes - [PR](https://code.forgejo.org/forgejo/runner/pulls/1003): <!--number 1003 --><!--line 0 --><!--description Zml4OiByZW1vdmUgTFhDIHdvcmtpbmcgZGlyZWN0b3J5IHdoZW4gaXQgY29tcGxldGVz-->fix: remove LXC working directory when it completes<!--description--> <!--end release-notes-assistant-->
earl-warren changed title from fix: remove LXC working directory when it completes to WIP: fix: remove LXC working directory when it completes 2025-09-16 10:38:14 +00:00
earl-warren reviewed 2025-09-16 10:39:02 +00:00
internal/app/run/runner_test.go Outdated
@ -391,0 +397,4 @@
stdoutStderr, err := exec.Command("find", dir).CombinedOutput()
require.NoError(t, err)
assert.Equal(t, dir, strings.TrimSuffix(string(stdoutStderr), "\n"))
}
earl-warren commented 2025-09-16 10:39:02 +00:00
Author
Contributor
Copy link
Copy Markdown

is there a better way to assert a directory is empty?

is there a better way to assert a directory is empty?
earl-warren marked this conversation as resolved
cascading-pr commented 2025-09-16 10:49:27 +00:00
Contributor
Copy link
Copy Markdown

cascading-pr updated at actions/setup-forgejo#682

cascading-pr updated at https://code.forgejo.org/actions/setup-forgejo/pulls/682
earl-warren changed title from WIP: fix: remove LXC working directory when it completes to fix: remove LXC working directory when it completes 2025-09-16 12:22:42 +00:00
earl-warren force-pushed wip-lxc-leak from f1b00080b5
All checks were successful
checks / validate mocks (pull_request) Successful in 47s
Details
checks / build and test (pull_request) Successful in 2m32s
Details
checks / runner exec tests (pull_request) Successful in 22s
Details
checks / runner integration tests (pull_request) Successful in 4m14s
Details
checks / integration tests (pull_request) Successful in 10m42s
Details
cascade / forgejo (pull_request_target) Has been skipped
Details
cascade / debug (pull_request_target) Has been skipped
Details
cascade / end-to-end (pull_request_target) Successful in 26m8s
Details
issue-labels / release-notes (pull_request_target) Successful in 5s
Details
to 9c24e5bfc3
All checks were successful
issue-labels / release-notes (pull_request_target) Successful in 7s
Details
checks / validate mocks (pull_request) Successful in 51s
Details
checks / build and test (pull_request) Successful in 3m8s
Details
checks / runner exec tests (pull_request) Successful in 27s
Details
checks / runner integration tests (pull_request) Successful in 6m3s
Details
checks / integration tests (pull_request) Successful in 12m32s
Details
cascade / debug (pull_request_target) Has been skipped
Details
cascade / end-to-end (pull_request_target) Successful in 5s
Details
cascade / forgejo (pull_request_target) Successful in 1m47s
Details
2025-09-16 12:32:24 +00:00 Compare
cascading-pr commented 2025-09-16 12:32:48 +00:00
Contributor
Copy link
Copy Markdown

cascading-pr updated at actions/setup-forgejo#682

cascading-pr updated at https://code.forgejo.org/actions/setup-forgejo/pulls/682
mfenniak approved these changes 2025-09-16 17:25:48 +00:00
mfenniak left a comment
Copy link
Copy Markdown

Seems to make sense to me. 👍

Seems to make sense to me. 👍
earl-warren deleted branch wip-lxc-leak 2025-09-16 19:42:05 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
viceice
mfenniak
Labels
Clear labels   
FreeBSD

   
Kind/Breaking
Breaking change that won't be backward compatible

  
Kind/Bug
Something is not working

  
Kind/Chore
It is no fun but it needs to be done, this is a chore.

  
Kind/DependencyUpdate
for pull requests that are created by renovate when updating a dependency

  
Kind/Documentation
Documentation changes

  
Kind/Enhancement
Improve existing functionality

  
Kind/Feature
New functionality

  
Kind/Security
This is security issue

  
Kind/Testing
Issue or pull request related to testing

  
Priority
Critical
 The priority is critical

  
Priority
High
 The priority is high

  
Priority
Low
 The priority is low

  
Priority
Medium
 The priority is medium

  
Reviewed
Confirmed
 Issue has been confirmed

  
Reviewed
Duplicate
 This issue or pull request already exists

  
Reviewed
Invalid
 Invalid issue

  
Reviewed
Won't Fix
 This issue won't be fixed

  
Status
Abandoned
 Somebody has started to work on this but abandoned work

  
Status
Blocked
 Something is blocking this issue or pull request

  
Status
Need More Info
 Feedback is required to reproduce issue or to continue work

  
Windows
Windows ports is an independent project, see https://github.com/Crown0815/Forgejo-runner-windows-builder

  
linux-powerpc64le
powerpc64le

  
linux-riscv64

   
linux-s390x

   
run-end-to-end-tests
Run https://code.forgejo.org/forgejo/end-to-end with a runner compiled from this pull request

  
run-forgejo-tests
Run https://codeberg.org/forgejo/forgejo tests importing the runner from this pull request

  
run-multi-platform-tests
Label a PR for automatic execution of test suite on arm64 architecture.

No labels
FreeBSD
Kind/Breaking
Kind/Bug
Kind/Chore
Kind/DependencyUpdate
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Windows
linux-powerpc64le
linux-riscv64
linux-s390x
run-end-to-end-tests
run-forgejo-tests
run-multi-platform-tests
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
earl-warren
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
forgejo/runner!1003
No description provided.