Merge pull request #12939 from tomponline/tp-network-attach

lxd: Fix incorrect network device attach warnings

lxd/db/networks.go

@@ -694,7 +694,7 @@ func (c *ClusterTx) GetNetworkWithInterface(ctx context.Context, devName string)
 	}
 
 	if id == -1 {
-		return -1, nil, fmt.Errorf("No network found for interface: %s", devName)
+		return -1, nil, api.StatusErrorf(http.StatusNotFound, "No network found for interface: %s", devName)
 	}
 
 	network := api.Network{

lxd/devices.go

@@ -664,7 +664,7 @@ func deviceEventListener(stateFunc func() *state.State) {
 			logger.Debugf("Scheduler: network: %s has been added: updating network priorities", e[0])
 			err = networkAutoAttach(s.DB.Cluster, e[0])
 			if err != nil {
-				logger.Warn("Failed to auto-attach network", logger.Ctx{"err": err})
+				logger.Warn("Failed to auto-attach network", logger.Ctx{"err": err, "dev": e[0]})
 			}
 
 		case e := <-chUSB:

lxd/networks_utils.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"context"
+	"fmt"
+	"net/http"
 
 	"github.com/canonical/lxd/lxd/cluster"
 	"github.com/canonical/lxd/lxd/db"
@@ -18,16 +20,22 @@ func networkAutoAttach(cluster *db.Cluster, devName string) error {
 	_ = cluster.Transaction(context.TODO(), func(ctx context.Context, c *db.ClusterTx) error {
 		_, dbInfo, err := c.GetNetworkWithInterface(ctx, devName)
 		if err != nil {
-			// No match found, move on
-			logger.Warnf("Failed to find network matching interface %v", devName)
-			return nil
+			if !api.StatusErrorCheck(err, http.StatusNotFound) {
+				return fmt.Errorf("Failed finding network matching interface %q: %w", devName, err)
+			}
+
+			return nil // No match found, move on.
 		}
 
 		networkName = dbInfo.Name
 		return nil
 	})
 
-	return network.AttachInterface(networkName, devName)
+	if networkName != "" {
+		return network.AttachInterface(networkName, devName)
+	}
+
+	return nil
 }
 
 // networkUpdateForkdnsServersTask runs every 30s and refreshes the forkdns servers list.