Update to rust 1.44.0 #10585

ryoqun · 2020-06-15T05:42:56Z

Problem

Using older rust.

Summary of Changes

Update it

Credits

@svenski123 Special thanks for previous works at #10445. That pr greatly reduced required efforts in this pr!

prev: #9754

ryoqun · 2020-06-15T05:47:45Z

I'm preparing nightly now.

ryoqun · 2020-06-15T05:50:02Z

Also, I'm aware of rust 1.44.1 is baking now, but not bothered with waiting after reviewing its pending release notes: rust-lang/rust#73238

ryoqun · 2020-06-15T06:01:03Z

Hmm, it looks like updating rust and rust-nightly is tightly coupled at the moment...

CI failed...

ryoqun · 2020-06-15T08:18:47Z

ci/docker-rust-nightly/README.md

@@ -2,23 +2,26 @@ Docker image containing rust nightly and some preinstalled crates used in CI.

 This image may be manually updated by running `CI=true ./build.sh` if you are a member
 of the [Solana Labs](https://hub.docker.com/u/solanalabs/) Docker Hub
-organization, but it is also automatically updated periodically by
-[this automation](https://buildkite.com/solana-labs/solana-ci-docker-rust-nightly).


I couldn't find this job?

This was stale information

ryoqun · 2020-06-15T08:19:43Z

ci/docker-rust/README.md

 This image manually maintained:
 1. Edit `Dockerfile` to match the desired rust version
-2. Run `./build.sh` to publish the new image, if you are a member of the [Solana


Well, I didn't know it's not needed to manually increment those numbers... ;)

ryoqun · 2020-06-15T08:23:18Z

ci/docker-run.sh

@@ -60,6 +60,10 @@ if [[ -z "$SOLANA_DOCKER_RUN_NOSETUID" ]]; then
  ARGS+=(--user "$(id -u):$(id -g)")
 fi

+if [[ -n $SOLANA_ALLOCATE_TTY ]]; then
+  ARGS+=(--tty)


I'm impatient so I wanna view a rainbow progress bar in terminal. :)

ryoqun · 2020-06-15T08:28:41Z

bench-tps/src/main.rs

@@ -115,7 +115,7 @@ fn main() {
        // Sort keypairs so that do_bench_tps() uses the same subset of accounts for each run.
        // This prevents the amount of storage needed for bench-tps accounts from creeping up
        // across multiple runs.
-        keypairs.sort_by(|x, y| x.pubkey().to_string().cmp(&y.pubkey().to_string()));
+        keypairs.sort_by_key(|x| x.pubkey().to_string());


@sakridge, @jstarry: I wonder why this is sorted in terms of base58...? Well, why .to_string() is needed? Plain binary byte-for-byte ordering isn't enough?

@ryoqun I can't think of a good reason. binary comparison sounds good!

I'll do this as a separate pr for back-porting.

ryoqun · 2020-06-15T10:38:06Z

ci/test-coverage.sh

@@ -11,7 +11,11 @@ annotate() {
 source ci/upload-ci-artifact.sh
 source scripts/ulimit-n.sh

-scripts/coverage.sh
+scripts/coverage.sh "$@"


I want to do like this:

$ SOLANA_ALLOCATE_TTY=1 SOLANA_DOCKER_RUN_NOSETUID=1 ci/docker-run.sh --nopull solanalabs/rust-nightly:2020-06-15 ci/test-coverage.sh -p solana-sdk test_slot_duration_from_slots_per_year

ryoqun · 2020-06-15T13:20:39Z

I'm proud of having some perseverance. But... CI is very unstable now:

This reverts commit 5960f08.

This reverts commit e14300d.

codecov · 2020-06-16T05:53:34Z

Codecov Report

Merging #10585 into master will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff            @@
##           master   #10585    +/-   ##
========================================
  Coverage    81.8%    81.9%            
========================================
  Files         301      301            
  Lines       70637    70204   -433     
========================================
- Hits        57833    57504   -329     
+ Misses      12804    12700   -104

ryoqun · 2020-06-16T06:03:14Z

ci/test-coverage.sh

-scripts/coverage.sh
+scripts/coverage.sh "$@"
+
+if [[ -z $CI ]]; then


For this manual use case: https://github.com/solana-labs/solana/pull/10585/files#diff-1143f3dc73bf3e79cf89244ccda0fe97R25

ryoqun · 2020-06-16T06:07:20Z

multinode-demo/validator.sh

@@ -285,7 +285,7 @@ setup_validator_accounts() {
  return 0
 }

-rpc_url=$($solana_gossip rpc-url --entrypoint "$gossip_entrypoint")
+rpc_url=$($solana_gossip rpc-url --timeout 180 --entrypoint "$gossip_entrypoint")


Yeah, was hard to debug.... Well, this depended on exact build timing. ;)

Greatly increase from the default 15 seconds to 180 to prevent another sorrow. ;)

ryoqun · 2020-06-16T07:35:06Z

sdk/src/timing.rs

@@ -40,10 +40,12 @@ pub fn years_as_slots(years: f64, tick_duration: &Duration, ticks_per_slot: u64)

 /// From slots per year to slot duration
 pub fn slot_duration_from_slots_per_year(slots_per_year: f64) -> Duration {
-    // Regarding division by zero potential below: for some reason, if Rust stores an `inf` f64 and


@CriesofCarrots This is added by https://github.com/solana-labs/solana/pull/7130/files#diff-826aa0353ee517a070e3c98cc61423eaR43

FYI, rust (stable rust 1.45+; this will be affected in our nightly CI builds after this pr) is actually fixing this behavior: https://github.com/rust-lang/rust/blob/master/RELEASES.md#compatibility-notes

I'm preserving the current behavior.

Sweet, thanks!

ryoqun · 2020-06-16T07:47:12Z

@svenski123 FYI, we're about to go rust 1.45 based on your previous efforts at #10445. Thank you very much! :)

ryoqun · 2020-06-16T07:51:50Z

@mvines Finally, this got ready for review and merge! I've updated relevant docs and fiddled scripts a bit while doing this for the first time. Could you review these?

ryoqun · 2020-06-16T07:54:00Z

ci/docker-rust-nightly/Dockerfile

 ARG date

 RUN set -x \
 && rustup install nightly-$date \
 && rustup component add clippy --toolchain=nightly-$date \
+ && rustup component add rustfmt --toolchain=nightly-$date \


Well, this is needed: https://buildkite.com/solana-labs/solana/builds/26037#29954e66-85ab-4c7b-b90a-1454aae6d52e/82-111

ryoqun · 2020-06-17T07:25:09Z

Postmotem: I needed quick fixup PRs: #10633, #10634, #10640 and fixed the root cause to prevent it from re-occuring: #10651

ryoqun commented Jun 15, 2020

View reviewed changes

ryoqun mentioned this pull request Jun 16, 2020

Group showing various rust toolchain versions #10618

Merged

ryoqun added 16 commits June 16, 2020 14:52

Update rust 1.44.0

42168b8

Update rust nightly 1.46.0

e01abc5

Update docs

3ab49d8

Compile all source code with stable and nightly

78dc87d

Fix clippy errors

4db7afd

Add another note

93e45ce

script tweaks

6eb0307

Fix a test...

811a39b

Add another workaround

b94e5fa

Add hack

acd8455

Increase timeout...

b614fab

Revert "Add hack"

82a7e50

This reverts commit 5960f08.

Revert "Add another workaround"

56f1dc1

This reverts commit e14300d.

Require nightly rustfmt and use older nightly a bit

a60ab54

Improve document a bit

0833a68

Revert now not-existing clippy check...

3b99559

ryoqun force-pushed the rust-1.44.0 branch from 9e79e89 to 3b99559 Compare June 16, 2020 06:01

ryoqun commented Jun 16, 2020

View reviewed changes

ryoqun mentioned this pull request Jun 16, 2020

Clippy cleanup for all targets and nighly rust (also support 1.44.0) #10445

Merged

ryoqun changed the title ~~Update rust 1.44.0~~ Update to rust 1.44.0 Jun 16, 2020

ryoqun requested a review from mvines June 16, 2020 07:50

ryoqun commented Jun 16, 2020

View reviewed changes

mvines approved these changes Jun 16, 2020

View reviewed changes

ryoqun merged commit 40ccade into solana-labs:master Jun 16, 2020

This was referenced Jun 16, 2020

program execution: Rust 1.45 introduces incompatible math runtime behavior changes #10626

Closed

Trigger all CI jobs for Dockerfile changes #10651

Merged

ryoqun mentioned this pull request Mar 6, 2023

ci: test-checks.sh all sbf code & use nightly only #30602

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to rust 1.44.0 #10585

Update to rust 1.44.0 #10585

ryoqun commented Jun 15, 2020 •

edited

Loading

ryoqun commented Jun 15, 2020

ryoqun commented Jun 15, 2020

ryoqun commented Jun 15, 2020

ryoqun Jun 15, 2020

mvines Jun 16, 2020

ryoqun Jun 15, 2020

ryoqun Jun 15, 2020

ryoqun Jun 15, 2020

jstarry Jun 15, 2020

ryoqun Jun 16, 2020

ryoqun Jun 15, 2020

ryoqun commented Jun 15, 2020

codecov bot commented Jun 16, 2020 •

edited

Loading

ryoqun Jun 16, 2020 •

edited

Loading

ryoqun Jun 16, 2020

ryoqun Jun 16, 2020 •

edited

Loading

CriesofCarrots Jun 16, 2020

ryoqun commented Jun 16, 2020

ryoqun commented Jun 16, 2020

ryoqun Jun 16, 2020

ryoqun commented Jun 17, 2020

Update to rust 1.44.0 #10585

Update to rust 1.44.0 #10585

Conversation

ryoqun commented Jun 15, 2020 • edited Loading

Problem

Summary of Changes

Credits

ryoqun commented Jun 15, 2020

ryoqun commented Jun 15, 2020

ryoqun commented Jun 15, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryoqun commented Jun 15, 2020

codecov bot commented Jun 16, 2020 • edited Loading

Codecov Report

ryoqun Jun 16, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryoqun Jun 16, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryoqun commented Jun 16, 2020

ryoqun commented Jun 16, 2020

Choose a reason for hiding this comment

ryoqun commented Jun 17, 2020

ryoqun commented Jun 15, 2020 •

edited

Loading

codecov bot commented Jun 16, 2020 •

edited

Loading

ryoqun Jun 16, 2020 •

edited

Loading

ryoqun Jun 16, 2020 •

edited

Loading