Merge pull request #13030 from roosterfish/fix_rsync_feature_offer

Migration: Accept offered rsync features for `BLOCK_AND_RSYNC`
canonical · Mar 4, 2024 · 12bf2cd · 12bf2cd
2 parents f6378f2 + 0358094
commit 12bf2cd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lxd/migration/migration_volumes.go b/lxd/migration/migration_volumes.go
@@ -193,7 +193,7 @@ func MatchTypes(offer *MigrationHeader, fallbackType MigrationFSType, ourTypes [
 				offeredFeatures = offer.GetZfsFeaturesSlice()
 			} else if offerFSType == MigrationFSType_BTRFS {
 				offeredFeatures = offer.GetBtrfsFeaturesSlice()
-			} else if offerFSType == MigrationFSType_RSYNC {
+			} else if shared.ValueInSlice(offerFSType, []MigrationFSType{MigrationFSType_RSYNC, MigrationFSType_BLOCK_AND_RSYNC}) {
 				offeredFeatures = offer.GetRsyncFeaturesSlice()
 				if !shared.ValueInSlice("bidirectional", offeredFeatures) {
 					// If no bi-directional support, this means we are getting a response from