Skip to content

refactor(agent): Move SSH server into agentssh package #7004

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

Merged
merged 8 commits into from
Apr 6, 2023
Merged

refactor(agent): Move SSH server into agentssh package #7004

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
37adb62
refactor(agent): Move SSH server into agentssh package
mafredri Apr 4, 2023
d5f7a4e
Rename receivers
mafredri Apr 4, 2023
3ea3e70
Remove unused context
mafredri Apr 4, 2023
126813f
Use s logger
mafredri Apr 4, 2023
667d038
Rename unused arg _
mafredri Apr 4, 2023
94d7593
Address PR feedback
mafredri Apr 6, 2023
e71ba85
Merge branch 'main' into mafredri/refactor-agent-sshd
mafredri Apr 6, 2023
ed63a2b
Improve handling of serve/close
mafredri Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename unused arg _
  • Loading branch information
@mafredri
mafredri committed Apr 4, 2023
commit 667d038fe262d3bd21e827569f3534f242cfe9b0
2 changes: 1 addition & 1 deletion agent/agentssh/agentssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ func (s *Server) Close() error {
// accepting new connections.
//
// Shutdown is not implemented.
func (*Server) Shutdown(ctx context.Context) error {
func (*Server) Shutdown(_ context.Context) error {
// TODO(mafredri): Implement shutdown, SIGHUP running commands, etc.
Copy link
Member

Choose a reason for hiding this comment

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

Is this not what srv.Close does? I would assume it returns errors in the server functions, which would then cause any deferred process.Kill()s or whatever we have to fire off.

Copy link
Member Author

Choose a reason for hiding this comment

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

Currently Close abruptly closes connections in a way that 1) leaves clients hanging waiting for timeout and 2) sighup isn't properly propagated to running processes.

Issue 1) is easily solved by tracking sessions (follow-up PR) but that won't help with process closure.

In theory I guess all of this could be handled by Close, but it would be good to allow process closure to take a few seconds (Shutdown API is more suitable for this than blocking in Close). Agent would ultimately first do a Shutdown and finally a Close at the end.

More on this in #6177 (more of a guideline than defining the final implementation).

return nil
}
Expand Down