Skip to content

Fix data race in file descriptors#34183

Merged
atburke merged 1 commit intomasterfrom
atburke/file-descriptor-race
Nov 11, 2023
Merged

Fix data race in file descriptors#34183
atburke merged 1 commit intomasterfrom
atburke/file-descriptor-race

Conversation

@atburke
Copy link
Copy Markdown
Contributor

@atburke atburke commented Nov 3, 2023 •
edited
Loading

This change fixes a data race in the tests caused by file descriptors being closed in more than one place.

@atburke atburke added the no-changelog Indicates that a PR does not require a changelog entry label Nov 3, 2023
@atburke atburke marked this pull request as ready for review November 3, 2023 17:40
@github-actions github-actions Bot requested review from strideynet and tcsc November 3, 2023 17:40
@github-actions github-actions Bot added machine-id size/sm tctl tctl - Teleport admin tool labels Nov 3, 2023
@atburke atburke mentioned this pull request Nov 3, 2023
Merged
strideynet
strideynet approved these changes Nov 9, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@strideynet strideynet left a comment

Choose a reason for hiding this comment

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

Looks good - thanks for tackling this.

Comment thread lib/service/servicecfg/config.go Outdated
@atburke atburke force-pushed the atburke/file-descriptor-race branch from 967e937 to 25ebca3 Compare November 10, 2023 01:07
rosstimothy
rosstimothy approved these changes Nov 10, 2023
View reviewed changes
Comment thread lib/service/servicecfg/config.go Outdated
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from tcsc November 10, 2023 21:30
@atburke atburke force-pushed the atburke/file-descriptor-race branch from 9b5c73a to 0560df8 Compare November 11, 2023 00:40
@atburke atburke enabled auto-merge November 11, 2023 00:40
@atburke
Fix data race in file descriptors
a75e044 
This change fixes a data race in the tests caused by file descriptors
being closed in more than one place.
@atburke atburke force-pushed the atburke/file-descriptor-race branch from 0560df8 to a75e044 Compare November 11, 2023 02:07
@atburke atburke added this pull request to the merge queue Nov 11, 2023
Merged via the queue into master with commit 055d49b Nov 11, 2023
@atburke atburke deleted the atburke/file-descriptor-race branch November 11, 2023 03:10
@public-teleport-github-review-bot
Copy link
Copy Markdown

public-teleport-github-review-bot Bot commented Nov 11, 2023

@atburke See the table below for backport results.

Branch Result
branch/v14 Create PR

@atburke atburke mentioned this pull request Nov 13, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@strideynet strideynet strideynet approved these changes

@rosstimothy rosstimothy rosstimothy approved these changes

Assignees

No one assigned

Labels

machine-id no-changelog Indicates that a PR does not require a changelog entry size/sm tctl tctl - Teleport admin tool

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@atburke @strideynet @rosstimothy