Merge pull request #1683 from stgraber/backup

Fix importing from older backups

Author: hallyn

cmd/incusd/instances_post.go

@@ -694,12 +694,16 @@ func createFromBackup(s *state.State, r *http.Request, projectName string, data
 		return response.InternalError(err)
 	}
 
-	logger.Debug("Reading backup file info")
 	bInfo, err := backup.GetInfo(backupFile, s.OS, backupFile.Name())
 	if err != nil {
 		return response.BadRequest(err)
 	}
 
+	// Detect broken legacy backups.
+	if bInfo.Config == nil {
+		return response.BadRequest(fmt.Errorf("Backup file is missing required information"))
+	}
+
 	// Check project permissions.
 	var req api.InstancesPost
 	err = s.DB.Cluster.Transaction(r.Context(), func(ctx context.Context, tx *db.ClusterTx) error {

internal/server/backup/backup_info.go

@@ -60,6 +60,7 @@ type Info struct {
 func GetInfo(r io.ReadSeeker, sysOS *sys.OS, outputPath string) (*Info, error) {
 	result := Info{}
 	hasIndexFile := false
+	hasOptimizedHeader := false
 
 	// Define some bools used to create points for OptimizedStorage field.
 	optimizedStorageFalse := false
@@ -102,16 +103,22 @@ func GetInfo(r io.ReadSeeker, sysOS *sys.OS, outputPath string) (*Info, error) {
 			}
 
 			if result.OptimizedStorage != nil {
-				// No need to continue looking for optimized storage hint using the presence of the
-				// container.bin file below, as the index.yaml file tells us directly.
-				break
+				hasOptimizedHeader = true
 			} else {
 				// Default to non-optimized if not specified and continue reading to see if
 				// optimized container.bin file present.
 				result.OptimizedStorage = &optimizedStorageFalse
 			}
 		}
 
+		// Load old backup data.
+		if result.Config == nil && hdr.Name == "backup/container/backup.yaml" {
+			err = yaml.NewDecoder(tr).Decode(&result.Config)
+			if err != nil {
+				return nil, err
+			}
+		}
+
 		// If the tarball contains a binary dump of the container, then this is an optimized backup.
 		// This check is only for legacy backups before we introduced the Type and OptimizedStorage fields
 		// in index.yaml, so there is no need to perform this type of check for other types of backups that
@@ -120,10 +127,12 @@ func GetInfo(r io.ReadSeeker, sysOS *sys.OS, outputPath string) (*Info, error) {
 			optimizedStorageTrue := true
 			result.OptimizedStorage = &optimizedStorageTrue
 
-			// Stop read loop if index.yaml already parsed.
-			if hasIndexFile {
-				break
-			}
+			hasOptimizedHeader = true
+		}
+
+		// Check if we're done processing what we need.
+		if hasIndexFile && hasOptimizedHeader && result.Config != nil {
+			break
 		}
 	}