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

[release/1.2] Update tokio, rayon, and crossbeam to latest compatible versions #6136

Merged
merged 10 commits into from Feb 24, 2022

Conversation

onalante-msft
Copy link
Contributor

@onalante-msft onalante-msft commented Feb 18, 2022

crossbeam-utils recently patched an unsoundness bug in AtomicCell arithmetic: crossbeam-rs/crossbeam#781. However, this patch was not backported to the older versions required by tokio 0.1 and rayon. This PR updates tokio and rayon to the latest available versions, allowing some dependencies to upgrade to a safe crossbeam version. However, tokio still remains on a vulnerable version, so manual verification with a patched build was still required to determine that are not affected by the bug.

The notary module had to be modified to remove the tokio-process dependency due to the latter's reliance on crossbeam-utils 0.6 (through crossbeam-queue). notary now uses tokio_threadpool::blocking.

Azure IoT Edge PR checklist:

This checklist is used to make sure that common guidelines for a pull request are followed.

General Guidelines and Best Practices

  • I have read the contribution guidelines.
  • Title of the pull request is clear and informative.
  • Description of the pull request includes a concise summary of the enhancement or bug fix.

Testing Guidelines

  • Pull request includes test coverage for the included changes.
  • Description of the pull request includes
    • concise summary of tests added/modified
    • local testing done.

Brings minimum crossbeam-utils version up to 0.7.2.
@onalante-msft onalante-msft changed the base branch from master to release/1.1 February 18, 2022 01:30
@onalante-msft onalante-msft changed the base branch from release/1.1 to release/1.2 February 18, 2022 01:30
edgelet/edgelet-docker/src/notary.rs Outdated Show resolved Hide resolved
arsing
arsing previously approved these changes Feb 18, 2022
@arsing arsing self-requested a review February 18, 2022 20:26
@arsing
Copy link
Member

arsing commented Feb 18, 2022

Actually, since you're updating i-i-s too, do that first, and then include the git reference bump in this PR too.

arsing
arsing previously approved these changes Feb 23, 2022
@onalante-msft
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 6 pipeline(s).

@kodiakhq kodiakhq bot merged commit 6a807eb into Azure:release/1.2 Feb 24, 2022
@onalante-msft onalante-msft deleted the crossbeam-1.2 branch February 24, 2022 15:08
onalante-msft added a commit to onalante-msft/iotedge that referenced this pull request Feb 24, 2022
kodiakhq bot pushed a commit that referenced this pull request Mar 3, 2022
… versions (#6172)

*Cf.* #6136. The changes were previously reverted (#6160) due to conflicts with the release schedule.

## Azure IoT Edge PR checklist:

This checklist is used to make sure that common guidelines for a pull request are followed.

### General Guidelines and Best Practices
- [x] I have read the [contribution guidelines](https://github.com/azure/iotedge#contributing).
- [ ] Title of the pull request is clear and informative.
- [ ] Description of the pull request includes a concise summary of the enhancement or bug fix.

### Testing Guidelines
- [ ] Pull request includes test coverage for the included changes.
- Description of the pull request includes 
	- [ ] concise summary of tests added/modified
	- [x] local testing done.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants