Skip to content

[3.1] Update rust-toolchain to 2019-12-20, and cherry-pick #6374 - #6462

Merged
AndreMouche merged 2 commits into
tikv:release-3.1from
kennytm:cherry-pick-6374-to-3.1
Jan 16, 2020
Merged

[3.1] Update rust-toolchain to 2019-12-20, and cherry-pick #6374#6462
AndreMouche merged 2 commits into
tikv:release-3.1from
kennytm:cherry-pick-6374-to-3.1

Conversation

@kennytm

@kennytm kennytm commented Jan 10, 2020

Copy link
Copy Markdown
Contributor

What have you changed?

  1. Cherry-pick *: replace RocksIOLimiter by a pure-Rust async implementation, and eliminate the extra copies to memory when backing up a file #6374 to release-3.1
  2. *: replace RocksIOLimiter by a pure-Rust async implementation, and eliminate the extra copies to memory when backing up a file #6374 introduced a new dependency, async-speed-limit which relies on futures-io, which cannot be compiled using the old nightly-2019-06-14 toolchain. Therefore, the Rust version is updated to be the same as current master.
  3. The new Rust version also caused some significant changes to be made in this PR to silence some warnings, in particular
    • lazy_static is updated to 1.4
    • unlikely is now safe, so remove the redundant unsafe {} block around unlikely calls

Please explain in detail what the changes are in this PR and why they are needed:

  • Summarize your change
  • How does this PR work? Include a brief introduction for any changed logic (optional)
  • Separately describe each logical change (optional)
  • Describe any limitations of the current code (optional)

Don't assume reviewers understand the original issue.

What is the type of the changes?

  • Improvement (a change which is an improvement to an existing feature)

How is the PR tested?

  • Unit test

Does this PR affect documentation (docs) or should it be mentioned in the release notes?

No

Does this PR affect tidb-ansible?

No

Refer to a related PR or issue link (optional)

#6374.

Benchmark result if necessary (optional)

Any examples? (optional)

@kennytm kennytm added type/cherry-pick Type: PR - Cherry pick component/backup-restore Component: backup, import, external_storage labels Jan 10, 2020
@kennytm
kennytm force-pushed the cherry-pick-6374-to-3.1 branch 3 times, most recently from 4fb9f36 to 33fbf1f Compare January 10, 2020 18:48
…iminate the extra copies to memory when backing up a file (tikv#6374)

Signed-off-by: kennytm <kennytm@gmail.com>
- remove stabilized features
- unlikely() is now safe
- uninitialized() is deprecated (the simple replacement here is equally
  unsafe though)

Signed-off-by: kennytm <kennytm@gmail.com>
@kennytm
kennytm force-pushed the cherry-pick-6374-to-3.1 branch from 33fbf1f to 819f2b3 Compare January 10, 2020 18:54
@kennytm

kennytm commented Jan 11, 2020

Copy link
Copy Markdown
Contributor Author

/run-all-tests

@kennytm

kennytm commented Jan 11, 2020

Copy link
Copy Markdown
Contributor Author

PTAL @overvenus @5kbpers

@overvenus overvenus left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@overvenus
overvenus requested a review from 5kbpers January 14, 2020 03:42
@kennytm kennytm added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 14, 2020

@5kbpers 5kbpers left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kennytm kennytm added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jan 16, 2020
@kennytm

kennytm commented Jan 16, 2020

Copy link
Copy Markdown
Contributor Author

PTAL @AndreMouche

@5kbpers 5kbpers added this to the v3.1.0-beta.2 milestone Jan 16, 2020
@AndreMouche
AndreMouche merged commit dd1fed5 into tikv:release-3.1 Jan 16, 2020
@kennytm
kennytm deleted the cherry-pick-6374-to-3.1 branch January 16, 2020 10:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

component/backup-restore Component: backup, import, external_storage status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick Type: PR - Cherry pick

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants