refactor: Merge drive and reader config to enable implementations of tape management without synchronization

This commit is contained in:
Felicitas Pojtinger
2022-01-16 22:46:18 +01:00
parent 17e3c64f29
commit 5b84583403
28 changed files with 28 additions and 154 deletions

View File

@@ -262,15 +262,8 @@ func (o *Operations) Archive(
}
defer o.backend.CloseReader()
drive, err := o.backend.GetDrive()
if err != nil {
return []*tar.Header{}, err
}
defer o.backend.CloseDrive()
return hdrs, recovery.Index(
reader,
drive,
o.metadata,
o.pipes,
o.crypto,

View File

@@ -109,15 +109,8 @@ func (o *Operations) Delete(name string) error {
}
defer o.backend.CloseReader()
drive, err := o.backend.GetDrive()
if err != nil {
return err
}
defer o.backend.CloseDrive()
return recovery.Index(
reader,
drive,
o.metadata,
o.pipes,
o.crypto,

View File

@@ -128,15 +128,8 @@ func (o *Operations) Move(from string, to string) error {
}
defer o.backend.CloseReader()
drive, err := o.backend.GetDrive()
if err != nil {
return err
}
defer o.backend.CloseDrive()
return recovery.Index(
reader,
drive,
o.metadata,
o.pipes,
o.crypto,

View File

@@ -60,12 +60,6 @@ func (o *Operations) Restore(
}
defer o.backend.CloseReader()
drive, err := o.backend.GetDrive()
if err != nil {
return err
}
defer o.backend.CloseDrive()
for _, dbhdr := range headersToRestore {
if o.onHeader != nil {
o.onHeader(&config.HeaderEvent{
@@ -90,7 +84,6 @@ func (o *Operations) Restore(
if err := recovery.Fetch(
reader,
drive,
o.pipes,
o.crypto,

View File

@@ -289,15 +289,8 @@ func (o *Operations) Update(
}
defer o.backend.CloseReader()
drive, err := o.backend.GetDrive()
if err != nil {
return []*tar.Header{}, err
}
defer o.backend.CloseDrive()
return hdrs, recovery.Index(
reader,
drive,
o.metadata,
o.pipes,
o.crypto,