github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix several potential crashes in sshtunnel open/close code.

Browse Source
This commit is contained in:
CJ Cullen 2015-06-15 12:38:14 -07:00
parent 3f62e420cb
commit faa9313eea
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/master/master.go
View File

@ -807,7 +807,9 @@ func (m *Master) replaceTunnels(user, keyfile string, newAddrs []string) error {
if err != nil {
return err
}
tunnels.Open()
if err := tunnels.Open(); err != nil {
return err
}
if m.tunnels != nil {
m.tunnels.Close()
}
@ -844,31 +846,22 @@ func (m *Master) refreshTunnels(user, keyfile string) error {
func (m *Master) setupSecureProxy(user, keyfile string) {
// Sync loop for tunnels
// TODO: switch this to watch.
go func() {
for {
if err := m.loadTunnels(user, keyfile); err != nil {
glog.Errorf("Failed to load SSH Tunnels: %v", err)
}
var sleep time.Duration
if len(m.tunnels) == 0 {
sleep = time.Second
} else {
// tunnels could lag behind current set of nodes
sleep = 10 * time.Second
}
time.Sleep(sleep)
go util.Until(func() {
if err := m.loadTunnels(user, keyfile); err != nil {
glog.Errorf("Failed to load SSH Tunnels: %v", err)
}
}()
if len(m.tunnels) != 0 {
time.Sleep(9 * time.Second)
}
}, 1 * time.Second, util.NeverStop)
// Refresh loop for tunnels
// TODO: could make this more controller-ish
go func() {
for {
time.Sleep(5 * time.Minute)
if err := m.refreshTunnels(user, keyfile); err != nil {
glog.Errorf("Failed to refresh SSH Tunnels: %v", err)
}
go util.Until(func() {
time.Sleep(5 * time.Minute)
if err := m.refreshTunnels(user, keyfile); err != nil {
glog.Errorf("Failed to refresh SSH Tunnels: %v", err)
}
}()
}, 0 * time.Second, util.NeverStop)
}
func (m *Master) generateSSHKey(user, keyfile string) error {

14
pkg/util/ssh.go
View File

@ -97,6 +97,9 @@ func (s *SSHTunnel) Dial(network, address string) (net.Conn, error) {
}
func (s *SSHTunnel) tunnel(conn net.Conn, remoteHost, remotePort string) error {
if s.client == nil {
return errors.New("tunnel is not opened.")
}
tunnel, err := s.client.Dial("tcp", net.JoinHostPort(remoteHost, remotePort))
if err != nil {
return err
@ -107,6 +110,9 @@ func (s *SSHTunnel) tunnel(conn net.Conn, remoteHost, remotePort string) error {
}
func (s *SSHTunnel) Close() error {
if s.client == nil {
return errors.New("Cannot close tunnel. Tunnel was not opened.")
}
if err := s.client.Close(); err != nil {
return err
}
@ -196,9 +202,14 @@ func MakeSSHTunnels(user, keyfile string, addresses []string) (SSHTunnelList, er
func (l SSHTunnelList) Open() error {
for ix := range l {
if err := l[ix].Tunnel.Open(); err != nil {
return err
// Remove a failed Open from the list.
glog.Errorf("Failed to open tunnel %v: %v", l[ix], err)
l = append(l[:ix], l[ix+1:]...)
}
}
if len(l) == 0 {
return errors.New("Failed to open any tunnels.")
}
return nil
}
@ -209,6 +220,7 @@ func (l SSHTunnelList) Close() {
for ix := range l {
entry := l[ix]
go func() {
defer HandleCrash()
time.Sleep(1 * time.Minute)
if err := entry.Tunnel.Close(); err != nil {
glog.Errorf("Failed to close tunnel %v: %v", entry, err)