arduino
diff --git a/‎commands/service_monitor.go
Copy file name to clipboardExpand all lines: commands/service_monitor.go
+1-1Lines changed: 1 addition & 1 deletion b/‎commands/service_monitor.go
Copy file name to clipboardExpand all lines: commands/service_monitor.go
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎internal/cli/daemon/daemon.go
Copy file name to clipboardExpand all lines: internal/cli/daemon/daemon.go
-1Lines changed: 0 additions & 1 deletion b/‎internal/cli/daemon/daemon.go
Copy file name to clipboardExpand all lines: internal/cli/daemon/daemon.go
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎internal/integrationtest/daemon/daemon_concurrency_test.go
Copy file name to clipboardExpand all lines: internal/integrationtest/daemon/daemon_concurrency_test.go
+54Lines changed: 54 additions & 0 deletions b/‎internal/integrationtest/daemon/daemon_concurrency_test.go
Copy file name to clipboardExpand all lines: internal/integrationtest/daemon/daemon_concurrency_test.go
+54Lines changed: 54 additions & 0 deletions
@@ -125,8 +125,8 @@ func (s *arduinoCoreServerImpl) Monitor(stream rpc.ArduinoCoreService_MonitorSer
 	if err != nil {
 		return err
 	}
-	defer release()
 	monitor, boardSettings, err := findMonitorAndSettingsForProtocolAndBoard(pme, openReq.GetPort().GetProtocol(), openReq.GetFqbn())
+	release()
 	if err != nil {
 		return err
 	}
 
@@ -35,7 +35,6 @@ import (
 )
 
 var (
-	tr           = i18n.Tr
 	daemonize    bool
 	debug        bool
 	debugFile    string
 
@@ -20,6 +20,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"sync"
 	"testing"
 	"time"
 
@@ -76,3 +77,56 @@ func TestArduinoCliDaemonCompileWithLotOfOutput(t *testing.T) {
 	testCompile()
 	testCompile()
 }
+
+func TestInitAndMonitorConcurrency(t *testing.T) {
+	// See: https://github.com/arduino/arduino-cli/issues/2719
+
+	env, cli := integrationtest.CreateEnvForDaemon(t)
+	defer env.CleanUp()
+
+	_, _, err := cli.Run("core", "install", "arduino:avr")
+	require.NoError(t, err)
+
+	grpcInst := cli.Create()
+	require.NoError(t, grpcInst.Init("", "", func(ir *commands.InitResponse) {
+		fmt.Printf("INIT> %v\n", ir.GetMessage())
+	}))
+
+	cli.InstallMockedSerialMonitor(t)
+
+	// Open the serial monitor for 5 seconds
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	mon, err := grpcInst.Monitor(ctx, &commands.Port{
+		Address:  "/dev/test",
+		Protocol: "serial",
+	})
+	require.NoError(t, err)
+	var monitorCompleted sync.WaitGroup
+	monitorCompleted.Add(1)
+	go func() {
+		for {
+			msg, err := mon.Recv()
+			if err != nil {
+				break
+			}
+			fmt.Println("MON> ", msg)
+		}
+		fmt.Println("MON CLOSED")
+		monitorCompleted.Done()
+	}()
+
+	// Check that Init completes without blocking when the monitor is open
+	start := time.Now()
+	require.NoError(t, grpcInst.Init("", "", func(ir *commands.InitResponse) {
+		fmt.Printf("INIT> %v\n", ir.GetMessage())
+	}))
+	require.LessOrEqual(t, time.Since(start), 4*time.Second)
+	cancel()
+	monitorCompleted.Wait()
+
+	// Allow some time for the mocked-monitor process to terminate (otherwise the
+	// test will fail on Windows when the cleanup function tries to remove the
+	// executable).
+	time.Sleep(2 * time.Second)
+}
Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,8 @@ func (s *arduinoCoreServerImpl) Monitor(stream rpc.ArduinoCoreService_MonitorSer`
`125`	`125`	`if err != nil {`
`126`	`126`	`return err`
`127`	`127`	`}`
`128`		`- defer release()`
`129`	`128`	`monitor, boardSettings, err := findMonitorAndSettingsForProtocolAndBoard(pme, openReq.GetPort().GetProtocol(), openReq.GetFqbn())`
	`129`	`+ release()`
`130`	`130`	`if err != nil {`
`131`	`131`	`return err`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ import (`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`var (`
`38`		`- tr = i18n.Tr`
`39`	`38`	`daemonize bool`
`40`	`39`	`debug bool`
`41`	`40`	`debugFile string`