tape: store datastore name in tape archives and media catalog
So that we can store multiple datastores on a single media set. Deduplication is now per datastore (not per media set).
This commit is contained in:
		@ -434,27 +434,30 @@ pub fn list_content(
 | 
			
		||||
 | 
			
		||||
        let catalog = MediaCatalog::open(status_path, &media_id.label.uuid, false, false)?;
 | 
			
		||||
 | 
			
		||||
        for snapshot in catalog.snapshot_index().keys() {
 | 
			
		||||
            let backup_dir: BackupDir = snapshot.parse()?;
 | 
			
		||||
        for (store, content) in catalog.content() {
 | 
			
		||||
            for snapshot in content.snapshot_index.keys() {
 | 
			
		||||
                let backup_dir: BackupDir = snapshot.parse()?;
 | 
			
		||||
 | 
			
		||||
            if let Some(ref backup_type) = filter.backup_type {
 | 
			
		||||
                if backup_dir.group().backup_type() != backup_type { continue; }
 | 
			
		||||
            }
 | 
			
		||||
            if let Some(ref backup_id) = filter.backup_id {
 | 
			
		||||
                if backup_dir.group().backup_id() != backup_id { continue; }
 | 
			
		||||
            }
 | 
			
		||||
                if let Some(ref backup_type) = filter.backup_type {
 | 
			
		||||
                    if backup_dir.group().backup_type() != backup_type { continue; }
 | 
			
		||||
                }
 | 
			
		||||
                if let Some(ref backup_id) = filter.backup_id {
 | 
			
		||||
                    if backup_dir.group().backup_id() != backup_id { continue; }
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
            list.push(MediaContentEntry {
 | 
			
		||||
                uuid: media_id.label.uuid.clone(),
 | 
			
		||||
                label_text: media_id.label.label_text.to_string(),
 | 
			
		||||
                pool: set.pool.clone(),
 | 
			
		||||
                media_set_name: media_set_name.clone(),
 | 
			
		||||
                media_set_uuid: set.uuid.clone(),
 | 
			
		||||
                media_set_ctime: set.ctime,
 | 
			
		||||
                seq_nr: set.seq_nr,
 | 
			
		||||
                snapshot: snapshot.to_owned(),
 | 
			
		||||
                backup_time: backup_dir.backup_time(),
 | 
			
		||||
            });
 | 
			
		||||
                list.push(MediaContentEntry {
 | 
			
		||||
                    uuid: media_id.label.uuid.clone(),
 | 
			
		||||
                    label_text: media_id.label.label_text.to_string(),
 | 
			
		||||
                    pool: set.pool.clone(),
 | 
			
		||||
                    media_set_name: media_set_name.clone(),
 | 
			
		||||
                    media_set_uuid: set.uuid.clone(),
 | 
			
		||||
                    media_set_ctime: set.ctime,
 | 
			
		||||
                    seq_nr: set.seq_nr,
 | 
			
		||||
                    snapshot: snapshot.to_owned(),
 | 
			
		||||
                    store: store.to_owned(),
 | 
			
		||||
                    backup_time: backup_dir.backup_time(),
 | 
			
		||||
                });
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user