Skip to content
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

avoid stdout redirection on curl executions #115323

Merged
merged 1 commit into from Aug 31, 2023

Conversation

onur-ozkan
Copy link
Member

Avoid redirecting the curl output directly to the stdout. This alteration affects the integrity of the file during the retry process, as it also redirects the logs from the retries. Consequently, this leads to the bootstrap process failing because of an invalid checksum.

For more information, see the zulip thread

Fixes #115275

Avoid redirecting the curl output directly to the stdout. This alteration
affects the integrity of the file during the retry process, as it also redirects
the logs from the retries. Consequently, this leads to the bootstrap process failing
because of an invalid checksum.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot
Copy link
Collaborator

rustbot commented Aug 28, 2023

r? @Mark-Simulacrum

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

@rustbot 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 Aug 28, 2023
@Mark-Simulacrum
Copy link
Member

Same problem here -

curl.stdout(Stdio::from(f));
, right? Can you look into other curl downloads at least in bootstrap?

@onur-ozkan
Copy link
Member Author

Same problem here -

curl.stdout(Stdio::from(f));

, right? Can you look into other curl downloads at least in bootstrap?

This is already updated - I checked the whole rust source, only the parts I updated had this problem

@Mark-Simulacrum
Copy link
Member

Oh somehow I missed that, sorry.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 30, 2023

📌 Commit 4ea90af has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 Aug 30, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 30, 2023
…fix, r=Mark-Simulacrum

avoid stdout redirection on `curl` executions

Avoid redirecting the curl output directly to the stdout. This alteration affects the integrity of the file during the retry process, as it also redirects the logs from the retries. Consequently, this leads to the bootstrap process failing because of an invalid checksum.

For more information, see the [zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/checksum.20errors)

Fixes rust-lang#115275
@bors
Copy link
Contributor

bors commented Aug 31, 2023

⌛ Testing commit 4ea90af with merge 008c21c...

@bors
Copy link
Contributor

bors commented Aug 31, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 008c21c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 31, 2023
@bors bors merged commit 008c21c into rust-lang:master Aug 31, 2023
12 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Aug 31, 2023
@onur-ozkan onur-ozkan deleted the curl-download-checksum-fix branch August 31, 2023 04:40
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (008c21c): 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)

Results

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)
1.1% [1.1%, 1.1%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.0% [-1.7%, -0.5%] 4
Improvements ✅
(secondary)
-2.9% [-4.1%, -1.6%] 2
All ❌✅ (primary) -0.6% [-1.7%, 1.1%] 5

Cycles

Results

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.6% [0.6%, 0.6%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.6% [0.6%, 0.6%] 1

Binary size

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

Bootstrap: 631.235s -> 631.413s (0.03%)
Artifact size: 316.59 MiB -> 316.57 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Invalid checksum in bootstrap
5 participants