Skip to content

Cleanup stale lock files in the .lsp-locks directory #6816

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

Merged
merged 4 commits into from
Mar 27, 2025

Conversation

JoshuaBatty
Copy link
Member

@JoshuaBatty JoshuaBatty commented Jan 6, 2025

Description

I noticed there were quite a few old stale lock files in the .lsp-locks directory. We now check that the PID is active for each file in this directory, if it's not active then it's removed.

Checklist

  • I have linked to any relevant issues.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have updated the documentation where relevant (API docs, the reference, and the Sway book).
  • I have added tests that prove my fix is effective or that my feature works.
  • I have added (or requested a maintainer to add) the necessary Breaking* or New Feature labels where relevant.
  • I have done my best to ensure that my PR adheres to the Fuel Labs Code Review Standards.
  • I have requested a review from the relevant team or maintainers.

@JoshuaBatty JoshuaBatty requested a review from a team as a code owner January 6, 2025 23:33
@JoshuaBatty JoshuaBatty self-assigned this Jan 6, 2025
@JoshuaBatty JoshuaBatty added the language server LSP server label Jan 6, 2025
Copy link
Contributor

@zees-dev zees-dev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a few optional minor improvements (maybe opinionated here); nothing major - feel free to use them 😄
LGTM 👍

@kayagokalp
Copy link
Member

kayagokalp commented Jan 7, 2025

This made me check the forc locks and same thing happens there too, without any active forc process I have more than 50 locks in ~/.forc/.locks 🤯

edit: opened #6818

@sdankel sdankel temporarily deployed to fuel-sway-bot March 3, 2025 21:24 — with GitHub Actions Inactive
@JoshuaBatty JoshuaBatty enabled auto-merge (squash) March 27, 2025 09:07
@JoshuaBatty JoshuaBatty merged commit bfb38f8 into master Mar 27, 2025
38 checks passed
@JoshuaBatty JoshuaBatty deleted the josh/lsp_locks branch March 27, 2025 09:07
@tritao
Copy link
Contributor

tritao commented Mar 30, 2025

New test seems to be flakey, getting some failures in CI:

---- fs_locking::test::test_cleanup_stale_files stdout ----

thread 'fs_locking::test::test_cleanup_stale_files' panicked at forc-util/src/fs_locking.rs:266:9:
assertion `left == right` failed
  left: 0
 right: 1
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

zees-dev pushed a commit that referenced this pull request Apr 1, 2025
## Description
I noticed there were quite a few old stale lock files in the
`.lsp-locks` directory. We now check that the PID is active for each
file in this directory, if it's not active then it's removed.

## Checklist

- [ ] I have linked to any relevant issues.
- [x] I have commented my code, particularly in hard-to-understand
areas.
- [ ] I have updated the documentation where relevant (API docs, the
reference, and the Sway book).
- [ ] If my change requires substantial documentation changes, I have
[requested support from the DevRel
team](https://github.com/FuelLabs/devrel-requests/issues/new/choose)
- [x] I have added tests that prove my fix is effective or that my
feature works.
- [x] I have added (or requested a maintainer to add) the necessary
`Breaking*` or `New Feature` labels where relevant.
- [x] I have done my best to ensure that my PR adheres to [the Fuel Labs
Code Review
Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md).
- [x] I have requested a review from the relevant team or maintainers.

Co-authored-by: Sophie Dankel <[email protected]>
JoshuaBatty added a commit that referenced this pull request Apr 2, 2025
…s` crate (#7055)

## Description
adds the mark-flaky-tests crate so we can use `#[flaky]` above tests
that might fail. Also improves the `test_cleanup_stale_files` test which
was added in #6816

## Checklist

- [x] I have linked to any relevant issues.
- [x] I have commented my code, particularly in hard-to-understand
areas.
- [ ] I have updated the documentation where relevant (API docs, the
reference, and the Sway book).
- [ ] If my change requires substantial documentation changes, I have
[requested support from the DevRel
team](https://github.com/FuelLabs/devrel-requests/issues/new/choose)
- [x] I have added tests that prove my fix is effective or that my
feature works.
- [x] I have added (or requested a maintainer to add) the necessary
`Breaking*` or `New Feature` labels where relevant.
- [x] I have done my best to ensure that my PR adheres to [the Fuel Labs
Code Review
Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md).
- [x] I have requested a review from the relevant team or maintainers.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants