Bootstrap: Try renaming the file if removing fails #127152

ChrisDenton · 2024-06-30T08:23:50Z

Second attempt at working around #127126

If we can't remove the file, then try renaming it. This will leave the destination path free to use.

try-job: x86_64-msvc-ext

rustbot · 2024-06-30T08:23:58Z

rustbot has assigned @onur-ozkan.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

ChrisDenton · 2024-06-30T08:33:17Z

@bors try

Bootstrap: Try renaming the file if removing fails Second attempt at working around rust-lang#127126 If we can't remove the file, then try renaming it. This will leave the destination path free to use. try-job: x86_64-msvc-ext

bors · 2024-06-30T08:34:28Z

⌛ Trying commit 17a169c with merge 732189e...

bors · 2024-06-30T10:13:05Z

☀️ Try build successful - checks-actions
Build commit: 732189e (732189e67760492d47e62302dad40e09af01efd6)

ChrisDenton · 2024-06-30T10:16:20Z

Try build succeeded but considering the failure is intermittent that's doesn't prove this fixes the issue. Still, it's a good sign. I've just tied up the code a bit so I think this is ready for review.

onur-ozkan · 2024-07-02T05:17:31Z

AFAIK it's not possible to rename locked files on Windows.

ChrisDenton · 2024-07-02T05:43:28Z

The file is almost certaibly only locked because it's still being executed. That type of lock allows renames but not deletes (specifically it's locked due to a memory map, not due to FILE_SHARE).

ChrisDenton · 2024-07-02T05:53:01Z

Incidentally this can be trivially demonstrated on a Windows machine by this program:

fn main() {
    let exe = std::env::current_exe().unwrap();
    std::fs::rename(&exe, "moved.exe").unwrap();
}

That is, an application the renames itself while it is running.

onur-ozkan

r=me with the nit fix

onur-ozkan · 2024-07-02T05:58:01Z

src/bootstrap/src/lib.rs

+        if let Err(e) = fs::remove_file(dst) {
+            if e.kind() != io::ErrorKind::NotFound {
+                // workaround for https://github.com/rust-lang/rust/issues/127126
+                // if removing the file fails, attempt to rename it instead.
+                let now = t!(SystemTime::now().duration_since(SystemTime::UNIX_EPOCH));
+                let _ = fs::rename(dst, format!("{}-{}", dst.display(), now.as_nanos()));
+            }
+        }


Seems like a good use case #[cfg(windows)].

I used cfg!(windows) if that's alright as it's easier to integrate.

ChrisDenton · 2024-07-02T06:24:10Z

@bors r=onur-ozkan rollup

bors · 2024-07-02T06:24:13Z

📌 Commit b998cff has been approved by onur-ozkan

It is now in the queue for this repository.

bors · 2024-07-02T06:24:13Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

Kobzol · 2024-07-02T15:14:27Z

Let's make this a higher priority, as it can help alleviating spurious CI failures.

@bors p=10

Bootstrap: Try renaming the file if removing fails Second attempt at working around rust-lang#127126 If we can't remove the file, then try renaming it. This will leave the destination path free to use. try-job: x86_64-msvc-ext

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#126883 (Parenthesize break values containing leading label) - rust-lang#127136 (Fix `FnMut::call_mut`/`Fn::call` shim for async closures that capture references) - rust-lang#127146 (Uplift fast rejection to new solver) - rust-lang#127152 (Bootstrap: Try renaming the file if removing fails) - rust-lang#127168 (Use the aligned size for alloca at args/ret when the pass mode is cast) - rust-lang#127203 (Fix import suggestion error when path segment failed not from starting) - rust-lang#127212 (Update books) - rust-lang#127224 (Make `FloatTy` checks exhaustive in pretty print) - rust-lang#127230 (chore: remove duplicate words) - rust-lang#127243 (Add test for adt_const_params) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-07-02T17:53:06Z

⌛ Testing commit b998cff with merge 49ff390...

bors · 2024-07-02T20:08:20Z

☀️ Test successful - checks-actions
Approved by: onur-ozkan
Pushing 49ff390 to master...

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#126883 (Parenthesize break values containing leading label) - rust-lang#127136 (Fix `FnMut::call_mut`/`Fn::call` shim for async closures that capture references) - rust-lang#127146 (Uplift fast rejection to new solver) - rust-lang#127152 (Bootstrap: Try renaming the file if removing fails) - rust-lang#127168 (Use the aligned size for alloca at args/ret when the pass mode is cast) - rust-lang#127203 (Fix import suggestion error when path segment failed not from starting) - rust-lang#127212 (Update books) - rust-lang#127224 (Make `FloatTy` checks exhaustive in pretty print) - rust-lang#127230 (chore: remove duplicate words) - rust-lang#127243 (Add test for adt_const_params) r? `@ghost` `@rustbot` modify labels: rollup

rust-timer · 2024-07-02T22:55:20Z

Finished benchmarking commit (49ff390): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results (secondary -5.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-5.1%	[-5.7%, -3.5%]	9
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 696.686s -> 695.727s (-0.14%)
Artifact size: 327.51 MiB -> 327.59 MiB (0.02%)

rustbot assigned onur-ozkan Jun 30, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 30, 2024

Try renaming the file if removing fails

3d6cc60

ChrisDenton force-pushed the rename branch from 17a169c to 3d6cc60 Compare June 30, 2024 10:15

ChrisDenton linked an issue Jun 30, 2024 that may be closed by this pull request

spurious ci failure: The process cannot access the file because it is being used by another process #127126

Closed

onur-ozkan reviewed Jul 2, 2024

View reviewed changes

Use cfg!(windows)

b998cff

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 2, 2024

matthiaskrgr mentioned this pull request Jul 2, 2024

Rollup of 10 pull requests #127244

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 2, 2024

bors merged commit 49ff390 into rust-lang:master Jul 2, 2024
7 checks passed

rustbot added this to the 1.81.0 milestone Jul 2, 2024

ChrisDenton deleted the rename branch July 3, 2024 01:27

ehuss mentioned this pull request Jul 17, 2024

High failure rate on Windows MSVC CI with filesystem errors #127883

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bootstrap: Try renaming the file if removing fails #127152

Bootstrap: Try renaming the file if removing fails #127152

ChrisDenton commented Jun 30, 2024 •

edited

Loading

rustbot commented Jun 30, 2024

ChrisDenton commented Jun 30, 2024

bors commented Jun 30, 2024

bors commented Jun 30, 2024

ChrisDenton commented Jun 30, 2024

onur-ozkan commented Jul 2, 2024

ChrisDenton commented Jul 2, 2024 •

edited

Loading

ChrisDenton commented Jul 2, 2024

onur-ozkan left a comment

onur-ozkan Jul 2, 2024

ChrisDenton Jul 2, 2024

ChrisDenton commented Jul 2, 2024

bors commented Jul 2, 2024

bors commented Jul 2, 2024

Kobzol commented Jul 2, 2024

bors commented Jul 2, 2024

bors commented Jul 2, 2024

rust-timer commented Jul 2, 2024

Bootstrap: Try renaming the file if removing fails #127152

Bootstrap: Try renaming the file if removing fails #127152

Conversation

ChrisDenton commented Jun 30, 2024 • edited Loading

rustbot commented Jun 30, 2024

ChrisDenton commented Jun 30, 2024

bors commented Jun 30, 2024

bors commented Jun 30, 2024

ChrisDenton commented Jun 30, 2024

onur-ozkan commented Jul 2, 2024

ChrisDenton commented Jul 2, 2024 • edited Loading

ChrisDenton commented Jul 2, 2024

onur-ozkan left a comment

Choose a reason for hiding this comment

onur-ozkan Jul 2, 2024

Choose a reason for hiding this comment

ChrisDenton Jul 2, 2024

Choose a reason for hiding this comment

ChrisDenton commented Jul 2, 2024

bors commented Jul 2, 2024

bors commented Jul 2, 2024

Kobzol commented Jul 2, 2024

bors commented Jul 2, 2024

bors commented Jul 2, 2024

rust-timer commented Jul 2, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

ChrisDenton commented Jun 30, 2024 •

edited

Loading

ChrisDenton commented Jul 2, 2024 •

edited

Loading