mirror of
https://github.com/juanfont/headscale.git
synced 2024-12-22 07:57:34 +00:00
add lock around saving ts clients
Closes #1544 Co-Authored-By: Patrick Huang <huangxiaoman@gmail.com> Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
parent
4c12c02e71
commit
9ccf87c566
@ -197,7 +197,9 @@ func (s *EmbeddedDERPServerScenario) CreateTailscaleIsolatedNodesInUser(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
s.mu.Lock()
|
||||||
user.Clients[tsClient.Hostname()] = tsClient
|
user.Clients[tsClient.Hostname()] = tsClient
|
||||||
|
s.mu.Unlock()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
@ -112,7 +112,7 @@ type Scenario struct {
|
|||||||
pool *dockertest.Pool
|
pool *dockertest.Pool
|
||||||
network *dockertest.Network
|
network *dockertest.Network
|
||||||
|
|
||||||
headscaleLock sync.Mutex
|
mu sync.Mutex
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewScenario creates a test Scenario which can be used to bootstraps a ControlServer with
|
// NewScenario creates a test Scenario which can be used to bootstraps a ControlServer with
|
||||||
@ -212,8 +212,8 @@ func (s *Scenario) Users() []string {
|
|||||||
// will be return, otherwise a new instance will be created.
|
// will be return, otherwise a new instance will be created.
|
||||||
// TODO(kradalby): make port and headscale configurable, multiple instances support?
|
// TODO(kradalby): make port and headscale configurable, multiple instances support?
|
||||||
func (s *Scenario) Headscale(opts ...hsic.Option) (ControlServer, error) {
|
func (s *Scenario) Headscale(opts ...hsic.Option) (ControlServer, error) {
|
||||||
s.headscaleLock.Lock()
|
s.mu.Lock()
|
||||||
defer s.headscaleLock.Unlock()
|
defer s.mu.Unlock()
|
||||||
|
|
||||||
if headscale, ok := s.controlServers.Load("headscale"); ok {
|
if headscale, ok := s.controlServers.Load("headscale"); ok {
|
||||||
return headscale, nil
|
return headscale, nil
|
||||||
@ -326,7 +326,9 @@ func (s *Scenario) CreateTailscaleNodesInUser(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
s.mu.Lock()
|
||||||
user.Clients[tsClient.Hostname()] = tsClient
|
user.Clients[tsClient.Hostname()] = tsClient
|
||||||
|
s.mu.Unlock()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user