github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10583 from cjcullen/lockfix

Browse Source 
Don't hold lock while opening new sshTunnels.
This commit is contained in:
Zach Loafman
2015-07-01 06:41:04 -07:00
parent fa60ad310b ea2d617944
commit 513bf2ceba
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/master/master.go
View File

@@ -802,6 +802,8 @@ func (m *Master) Dial(net, addr string) (net.Conn, error) {
}
func (m *Master) needToReplaceTunnels(addrs []string) bool {
m.tunnelsLock.Lock()
defer m.tunnelsLock.Unlock()
if m.tunnels == nil || m.tunnels.Len() != len(addrs) {
return true
}
@@ -837,6 +839,8 @@ func (m *Master) replaceTunnels(user, keyfile string, newAddrs []string) error {
if err := tunnels.Open(); err != nil {
return err
}
m.tunnelsLock.Lock()
defer m.tunnelsLock.Unlock()
if m.tunnels != nil {
m.tunnels.Close()
}
@@ -845,8 +849,6 @@ func (m *Master) replaceTunnels(user, keyfile string, newAddrs []string) error {
}
func (m *Master) loadTunnels(user, keyfile string) error {
m.tunnelsLock.Lock()
defer m.tunnelsLock.Unlock()
addrs, err := m.getNodeAddresses()
if err != nil {
return err
@@ -861,8 +863,6 @@ func (m *Master) loadTunnels(user, keyfile string) error {
}
func (m *Master) refreshTunnels(user, keyfile string) error {
m.tunnelsLock.Lock()
defer m.tunnelsLock.Unlock()
addrs, err := m.getNodeAddresses()
if err != nil {
return err