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.

Sign up for GitHub

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

Jump to bottom

client/allocrunner/taskrunner: client.Close after err check #8825

Merged
merged 1 commit into from
Sep 4, 2020
Merged

client/allocrunner/taskrunner: client.Close after err check #8825

merged 1 commit into from
Sep 4, 2020

Conversation

alrs
Copy link
Contributor

@alrs alrs commented Sep 4, 2020

This moves defer client.Close() after the check for a non-nil err to prevent Close() from being called on a nil CSIPlugin.

tgross
tgross approved these changes Sep 4, 2020
View reviewed changes
Copy link
Member

@tgross tgross left a comment

Choose a reason for hiding this comment

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

Thanks for catching this @alrs!

I've double-checked that NewClient can't return us a nil client if a socket has been opened. LGTM.

@tgross tgross merged commit 79d983f into hashicorp:master Sep 4, 2020
tgross pushed a commit that referenced this pull request Sep 4, 2020
@alrs @tgross
client/allocrunner/taskrunner: client.Close after err check (#8825)
b670d82
tgross pushed a commit that referenced this pull request Sep 4, 2020
@alrs @tgross
client/allocrunner/taskrunner: client.Close after err check (#8825)
e860f62
@tgross
Copy link
Member

tgross commented Sep 4, 2020

Cherry-picked into the release-0.12.4 branch in e860f62

@tgross tgross added this to the 0.12.4 milestone Sep 4, 2020
@tgross tgross mentioned this pull request Sep 4, 2020
Merged
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 19, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@tgross tgross tgross approved these changes

Assignees
No one assigned
Labels
theme/crash theme/storage type/bug
Projects
None yet
Milestone
0.12.4
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@alrs @tgross