RSDK-5440 fix deadlock on simultaneous connect and update (viamroboti…

…cs#3145)
cheukt · Oct 27, 2023 · 0f4c3b0 · 0f4c3b0
1 parent a9a8c8a
commit 0f4c3b0
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/robot/client/client.go b/robot/client/client.go
@@ -370,6 +370,17 @@ func (rc *RobotClient) Changed() <-chan bool {
 }
 
 func (rc *RobotClient) connect(ctx context.Context) error {
+	if err := rc.connectWithLock(ctx); err != nil {
+		return err
+	}
+
+	if rc.notifyParent != nil {
+		rc.notifyParent()
+	}
+	return nil
+}
+
+func (rc *RobotClient) connectWithLock(ctx context.Context) error {
 	rc.mu.Lock()
 	defer rc.mu.Unlock()
 
@@ -398,9 +409,6 @@ func (rc *RobotClient) connect(ctx context.Context) error {
 	if rc.changeChan != nil {
 		rc.changeChan <- true
 	}
-	if rc.notifyParent != nil {
-		rc.notifyParent()
-	}
 	return nil
 }