Skip to content

[BETA] Don't fail if we can't acquire readonly lock#7165

Merged
alexcrichton merged 1 commit into
rust-lang:rust-1.37.0from
ehuss:beta-maybe-no-lock
Jul 23, 2019
Merged

[BETA] Don't fail if we can't acquire readonly lock#7165
alexcrichton merged 1 commit into
rust-lang:rust-1.37.0from
ehuss:beta-maybe-no-lock

Conversation

@ehuss

@ehuss ehuss commented Jul 23, 2019

Copy link
Copy Markdown
Contributor

Beta backport of #7149.

This commit updates support from rust-lang#6940 to not only gracefully handle
situations where the lock can be acquired in readonly but not read/write
mode but also handle situations where even a readonly lock can't be
acquired. If a readonly lock can't be acquired (and the read/write
failed) then we likely can't touch anything in the directory, so there's
no value gained from locking anyway.

Closes rust-lang#7147
@rust-highfive

Copy link
Copy Markdown

r? @Eh2406

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive

Copy link
Copy Markdown

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.37.0. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 23, 2019
@Eh2406

Eh2406 commented Jul 23, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jul 23, 2019

Copy link
Copy Markdown
Contributor

📌 Commit e46e185 has been approved by Eh2406

@bors 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 23, 2019
@bors

bors commented Jul 23, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit e46e185 with merge 3fd732c0dea9a7256c4e3254ad4d3cdc1d70f230...

@alexcrichton

Copy link
Copy Markdown
Member

Oh @bors is now only listening to azure so it won't work any more on the beta branch if we don't backport the azure config. That being said the full CI passed on the PR so should be good to merge manually.

@alexcrichton alexcrichton merged commit 2b390b5 into rust-lang:rust-1.37.0 Jul 23, 2019
@ehuss ehuss added this to the 1.37.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants