Break the loop #92589
Merged
Break the loop #92589
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A missing break statement lead to an infinite loop in bootstrap.py.
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ rollup |
|
📌 Commit 014f22a has been approved by |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 5, 2022
…lacrum Break the loop A missing break statement lead to an infinite loop in bootstrap.py. I also added a short sleep so it's not constantly running at 100%. But I can remove that if it's not wanted. Fixes rust-lang#76661
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 5, 2022
…lacrum Break the loop A missing break statement lead to an infinite loop in bootstrap.py. I also added a short sleep so it's not constantly running at 100%. But I can remove that if it's not wanted. Fixes rust-lang#76661
|
I don't think the extra sleep statement is needed: sqlite3 already waits diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index dc44b27c2a6..496a4dad898 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -41,7 +41,7 @@ def acquire_lock(build_dir):
curs = con.cursor()
while True:
try:
- curs.execute("BEGIN EXCLUSIVE")
+ return curs.execute("BEGIN EXCLUSIVE")
except sqlite3.OperationalError:
pass
return cursDon't know when or how that return got dropped, sorry about that. >,> |
|
@bors r- Good catch on returning the lock. |
bors
added
S-waiting-on-author
|
Oh, actually, no -- we'll already return the cursor after leaving the loop, so that seems handled. I think the extra sleep seems OK for now. @bors r+ |
|
📌 Commit 014f22a has been approved by |
bors
added
S-waiting-on-bors
|
@worldeva sorry if I'm stepping on your toes. I ran into this issue and someone suggested I submit a quick fix. I don't mind at all if you want to follow up with a PR to improve my changes, |
|
@bors p=1 (this bug is a big pain so it'd be good to get it fixed soon) |
|
⌛ Testing commit 014f22a with merge c8bee0001e8506c6ab218bf8df6fe61091ae0dce... |
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
💥 Test timed out |
bors
removed
the
S-waiting-on-bors
bors
added
the
S-waiting-on-review
|
@ChrisDenton Nop, its fine- I just somehow forgot how my own code worked, haha... Thanks for catching that :p |
|
@bors retry |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 6, 2022
…lacrum Break the loop A missing break statement lead to an infinite loop in bootstrap.py. I also added a short sleep so it's not constantly running at 100%. But I can remove that if it's not wanted. Fixes rust-lang#76661
This was referenced Jan 6, 2022
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 6, 2022
…askrgr Rollup of 8 pull requests Successful merges: - rust-lang#91055 (return the correct type for closures in `type_of`) - rust-lang#92207 (Delay remaining `span_bug`s in drop elaboration) - rust-lang#92417 (Fix spacing and ordering of words in pretty printed Impl) - rust-lang#92504 (Exit nonzero on rustc -Wall) - rust-lang#92559 (RustWrapper: adapt to new AttributeMask API) - rust-lang#92589 (Break the loop) - rust-lang#92607 (rustc_metadata: Some minor cleanups and optimizations) - rust-lang#92620 (Remove unused `ExtendDefault` struct) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A missing break statement lead to an infinite loop in bootstrap.py.
I also added a short sleep so it's not constantly running at 100%. But I can remove that if it's not wanted.
Fixes #76661