Merge pull request #3760 from stgraber/fixes

Various fixes

internal/server/db/networks.go

@@ -282,7 +282,7 @@ WHERE networks.id = ? AND networks.state = ?
 
 	configs := map[string]map[string]string{}
 	for _, node := range nodes {
-		config, err := query.SelectConfig(ctx, c.tx, "networks_config", "node_id=?", node.ID)
+		config, err := query.SelectConfig(ctx, c.tx, "networks_config", "network_id=? AND node_id=?", networkID, node.ID)
 		if err != nil {
 			return nil, err
 		}

internal/server/instance/drivers/qmp/qmp.go

@@ -301,7 +301,7 @@ var commandTimeouts = map[string]time.Duration{
 	"object-add":                heavyCommandTimeout,
 	"stop":                      heavyCommandTimeout,
 	"system_reset":              heavyCommandTimeout,
-	"query-migrate":             5 * time.Second,
+	"query-migrate":             heavyCommandTimeout,
 	"screendump":                10 * time.Second,
 }
 

internal/server/network/ovn/ovn_nb_actions.go

@@ -2765,6 +2765,11 @@ func (o *NB) SetChassisGroupPriority(ctx context.Context, haChassisGroupName OVN
 		operations = append(operations, updateOps...)
 	}
 
+	// Skip the transaction if nothing changed.
+	if len(operations) == 0 {
+		return nil
+	}
+
 	// Apply the changes.
 	resp, err := o.client.Transact(ctx, operations...)
 	if err != nil {