lxd/migrate: Time out when waiting for connections

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
lxc · Oct 26, 2021 · 04638c5 · 04638c5
1 parent 87f6103
commit 04638c5
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/lxd/migrate_instance.go b/lxd/migrate_instance.go
@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/gorilla/websocket"
@@ -340,7 +341,14 @@ func (s *migrationSourceWs) preDumpLoop(state *state.State, args *preDumpLoopArg
 }
 
 func (s *migrationSourceWs) Do(state *state.State, migrateOp *operations.Operation) error {
-	<-s.allConnected
+	logger.Info("Waiting for migration channel connections")
+	select {
+	case <-time.After(time.Second * 10):
+		return fmt.Errorf("Timed out waiting for connections")
+	case <-s.allConnected:
+	}
+
+	logger.Info("Migration channels connected")
 
 	var poolMigrationTypes []migration.Type
 
@@ -779,7 +787,13 @@ func (c *migrationSink) Do(state *state.State, revert *revert.Reverter, migrateO
 	var err error
 
 	if c.push {
-		<-c.allConnected
+		logger.Info("Waiting for migration channel connections")
+		select {
+		case <-time.After(time.Second * 10):
+			return fmt.Errorf("Timed out waiting for connections")
+		case <-c.allConnected:
+		}
+		logger.Info("Migration channels connected")
 	}
 
 	disconnector := c.src.disconnect

diff --git a/lxd/migrate_storage_volumes.go b/lxd/migrate_storage_volumes.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/gorilla/websocket"
@@ -37,7 +38,15 @@ func newStorageMigrationSource(volumeOnly bool) (*migrationSourceWs, error) {
 }
 
 func (s *migrationSourceWs) DoStorage(state *state.State, projectName string, poolName string, volName string, migrateOp *operations.Operation) error {
-	<-s.allConnected
+	logger.Info("Waiting for migration channel connections")
+	select {
+	case <-time.After(time.Second * 10):
+		return fmt.Errorf("Timed out waiting for connections")
+	case <-s.allConnected:
+	}
+
+	logger.Info("Migration channels connected")
+
 	defer s.disconnect()
 
 	var poolMigrationTypes []migration.Type
@@ -206,7 +215,13 @@ func (c *migrationSink) DoStorage(state *state.State, projectName string, poolNa
 	var err error
 
 	if c.push {
-		<-c.allConnected
+		logger.Info("Waiting for migration channel connections")
+		select {
+		case <-time.After(time.Second * 10):
+			return fmt.Errorf("Timed out waiting for connections")
+		case <-c.allConnected:
+		}
+		logger.Info("Migration channels connected")
 	}
 
 	disconnector := c.src.disconnect