Add support for configurable keep-alives #2349
Merged
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
russjones
changed the title
russjones
force-pushed
the
rjones/keep-alives
branch
from
20cbeb4
to
2dbaa01
Compare
klizhentas
requested changes
Nov 16, 2018
| @@ -38,13 +38,13 @@ import ( | |||
| "github.com/gravitational/teleport/lib/utils" | |||
|
|
|||
| "github.com/gravitational/trace" | |||
| log "github.com/sirupsen/logrus" | |||
There was a problem hiding this comment.
what's up with this refactoring?
There was a problem hiding this comment.
Moved to our new structured logging everywhere in lib/srv.
There was a problem hiding this comment.
how does renaming to logrus help?
| closeContext, closeCancel := context.WithCancel(context.Background()) | ||
| defer closeCancel() | ||
|
|
||
| clusterConfig, err := s.GetAccessPoint().GetClusterConfig() |
There was a problem hiding this comment.
ditto for the error handling logic and cleanup
There was a problem hiding this comment.
Everything should be cleaned up in a defer here.
| // The keep-alive loop will keep pinging the remote server and after it has | ||
| // missed a certain number of keep-alive requests it will cancel the | ||
| // closeContext which signals the server to shutdown. | ||
| go srv.StartKeepAliveLoop(srv.KeepAliveParams{ |
There was a problem hiding this comment.
why don't you pass a context to keepalive loop as well?
There was a problem hiding this comment.
I am passing a context to the keep-alive loop?
russjones
force-pushed
the
rjones/keep-alives
branch
from
2dbaa01
to
337dc02
Compare
klizhentas
reviewed
Nov 25, 2018
klizhentas
requested changes
Nov 25, 2018
control how often the server sends keep-alive messages to clients and after how many missed keep-alive replies the server tears down the connection to the client.
russjones
force-pushed
the
rjones/keep-alives
branch
from
337dc02
to
175ad7d
Compare
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.
Purpose
Allow configurable keep-alives to be sent from Teleport servers to clients. This is to prevent firewalls, load balancers, and VPNs from tearing down idle SSH session.
Implementation
keep_alive_intervalto Teleport configuration. This sets the interval at which Teleport will send keep-alive messages. The default value mirrorssshdat 15 minutes.keep_alive_count_max, the number of messed keep-alive messages before the server tears down the connection to the client. The default value mirrorssshdat 3.Related Issues
Fixes #2334