Simplify VNet setup #41653
Closed
Simplify VNet setup #41653
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nklaassen
reviewed
May 17, 2024
ravicious
force-pushed
the
r7s/simplify-vnet-setup
branch
from
4b54ab9
to
0cff6ea
Compare
ravicious
force-pushed
the
r7s/simplify-vnet-setup
branch
from
ae150fb
to
96f32a2
Compare
nklaassen
reviewed
May 17, 2024
nklaassen
reviewed
May 17, 2024
|
i had a bunch of implementation suggestions but overall i do like this much better now |
ravicious
force-pushed
the
r7s/simplify-vnet-setup
branch
from
247450b
to
42b0636
Compare
zmb3
reviewed
May 20, 2024
ravicious
force-pushed
the
r7s/teleterm-vnet
branch
from
9e3ca78
to
1dc9fb2
Compare
ravicious
force-pushed
the
r7s/simplify-vnet-setup
branch
from
673bb43
to
caa3821
Compare
|
Didn't add anything new today besides the tests, just rebasing on top of my custom branch off of |
nklaassen
reviewed
May 21, 2024
|
@nklaassen After I rebased it on top of I think it's maybe because I'm signing off today, so I'll try to hunt it down tomorrow. |
|
But generally it'd be nice if I could get this PR through reviews by the end of tomorrow, then I'd have Thursday and Friday to get other dependent PRs through. |
This is the weirdest thing... I had the osascript shell command redirecting logs to a file for debugging, and when I removed that, the /etc/resolver cleanup broke. But I can't debug it without logs 😭 so I added back the log redirect to |
It will be needed in VNet to issue app certs.
ravicious
force-pushed
the
r7s/teleterm-vnet
branch
from
1dc9fb2
to
fb0c745
Compare
ravicious
force-pushed
the
r7s/simplify-vnet-setup
branch
from
caa3821
to
3bbcc2a
Compare
|
@nklaassen @zmb3 Are there any other outstanding issues that I should address? It'd be great if I could split this tomorrow and merge it into #41413 and #41415. |
github-actions
bot
added
size/sm
tsh
This comment was marked as outdated.
This comment was marked as outdated.
ravicious
added
the
no-changelog
nklaassen
approved these changes
May 23, 2024
no it seems good to me, a bit hard to review on top of #41413, i'll make sure to review after you merge it in there |
zmb3
approved these changes
May 23, 2024
ravicious
added a commit
that referenced
this pull request
May 23, 2024
Squashed from #41653 (only lib/vnet and tool/tsh).
ravicious
force-pushed
the
r7s/teleterm-vnet
branch
from
fb0c745
to
a042be1
Compare
ravicious
added a commit
that referenced
this pull request
May 31, 2024
Squashed from #41653 (only lib/vnet and tool/tsh).
github-merge-queue bot
pushed a commit
that referenced
this pull request
May 31, 2024
* Split vnet.Run into vnet.Setup and vnet.Run lib/teleterm cannot reuse this function due to different semantics of contexts within an RPC vs a CLI command. It needs one function that has request-response semantics and another that blocks that can be run from a separate goroutine. * tsh vnet: Select on ctx.Done too when awaiting TUN device Without this extra select on ctx.Done, interrupting tsh vnet at that moment would return an error about using a closed socket. That's because when the context gets canceled, another goroutine closes the socket. Instead, we should wait for either the cancelation of the context or socket.AcceptUnix returning a value. To test this, run `tsh vnet`. When the osascript prompt is shown, go back to the terminal and Ctrl+C the command. The previous version would show an error about using closed connection whereas this exits cleanly. * Do not show context canceled errors to user The previous version would show "context canceled" after sending SIGINT to tsh vnet after the user entered the password in the prompt and the TUN device was set up. * Fix handling of admin subcommand exiting prematurely with no err If the socket file was removed, the admin subcommand stops. The previous version of VNet would continue running. This version correctly propagates the fact that the admin subcommand has quit prematurely with no error and shuts down vnet.Manager as well. * Correctly report admin subcommand quitting prematurely Because of the changes from a couple of commits ago related to ignoring context.Canceled errors, if the admin subcommand was killed or has crashed, VNet would stop with no error message. This commit fixes that and propagates the error from osascript. * Avoid race condition when ctx gets canceled on awaiting TUN device * Refactor detecting premature exit with no error * Simplify shared VNet setup code Squashed from #41653 (only lib/vnet and tool/tsh). * Rename taskErr to expectedErr * Remove special treatment of context.Canceled in tsh vnet * Turn socket closer into critical task
github-actions bot
pushed a commit
that referenced
this pull request
May 31, 2024
Squashed from #41653 (only lib/vnet and tool/tsh).
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jun 3, 2024
* Split vnet.Run into vnet.Setup and vnet.Run lib/teleterm cannot reuse this function due to different semantics of contexts within an RPC vs a CLI command. It needs one function that has request-response semantics and another that blocks that can be run from a separate goroutine. * tsh vnet: Select on ctx.Done too when awaiting TUN device Without this extra select on ctx.Done, interrupting tsh vnet at that moment would return an error about using a closed socket. That's because when the context gets canceled, another goroutine closes the socket. Instead, we should wait for either the cancelation of the context or socket.AcceptUnix returning a value. To test this, run `tsh vnet`. When the osascript prompt is shown, go back to the terminal and Ctrl+C the command. The previous version would show an error about using closed connection whereas this exits cleanly. * Do not show context canceled errors to user The previous version would show "context canceled" after sending SIGINT to tsh vnet after the user entered the password in the prompt and the TUN device was set up. * Fix handling of admin subcommand exiting prematurely with no err If the socket file was removed, the admin subcommand stops. The previous version of VNet would continue running. This version correctly propagates the fact that the admin subcommand has quit prematurely with no error and shuts down vnet.Manager as well. * Correctly report admin subcommand quitting prematurely Because of the changes from a couple of commits ago related to ignoring context.Canceled errors, if the admin subcommand was killed or has crashed, VNet would stop with no error message. This commit fixes that and propagates the error from osascript. * Avoid race condition when ctx gets canceled on awaiting TUN device * Refactor detecting premature exit with no error * Simplify shared VNet setup code Squashed from #41653 (only lib/vnet and tool/tsh). * Rename taskErr to expectedErr * Remove special treatment of context.Canceled in tsh vnet * Turn socket closer into critical task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After a conversation with Alan, I decided to try out a couple of improvements which could simplify what I've done in #41413.
In #41413,
vnet.Setupandvnet.Runserve mostly as a big bags of stray functions that are needed to start VNet that I wanted to share between tsh and Connect. The main problem the split intoSetupandRunwas solving is that tsh can set up VNet and then start it while blocking the main thread, whereas Connect cannot do this. The RPC in Connect that sets up VNet needs to return after a successful setup and let the VNet manager and the admin subcommand run in the background.This PR:
errgroupto get rid of all the shenanigans I was doing with contexts in Improve handling of various lifecycle erorrs in VNet #41413.cancel.The setup code ends up being a little bit more elaborate, but I think it's easier to follow and doesn't raise as much red flags as the one I introduced in #41413 does.