mirrors/stfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Don't assume EOF filemark size on disk

Browse Source
This commit is contained in:
Felicitas Pojtinger
2021-12-01 00:01:18 +01:00
parent 002d4df82f
commit b60929205a
2 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/stbak/cmd/recovery_index.go
View File

@@ -96,27 +96,26 @@ func index(
for {
hdr, err := tr.Next()
if err != nil {
// Seek right after the next two blocks to skip the trailer
if _, err := f.Seek((controllers.BlockSize * 2), io.SeekCurrent); err == nil {
for {
curr, err := f.Seek(0, io.SeekCurrent)
if err != nil {
return err
}
nextTotalBlocks := math.Ceil(float64((curr)) / float64(controllers.BlockSize))
record = int64(nextTotalBlocks) / int64(recordSize)
block = int64(nextTotalBlocks) - (record * int64(recordSize)) - 2
record = int64(nextTotalBlocks) / int64(viper.GetInt(recordSizeFlag))
block = int64(nextTotalBlocks) - (record * int64(viper.GetInt(recordSizeFlag)))
if block < 0 {
record--
block = int64(recordSize) - 1
} else if block >= int64(recordSize) {
block = int64(viper.GetInt(recordSizeFlag)) - 1
} else if block >= int64(viper.GetInt(recordSizeFlag)) {
record++
block = 0
}
// Seek to record and block
if _, err := f.Seek(int64((recordSize*controllers.BlockSize*int(record))+int(block)*controllers.BlockSize), io.SeekStart); err != nil {
if _, err := f.Seek(int64((viper.GetInt(recordSizeFlag)*controllers.BlockSize*int(record))+int(block)*controllers.BlockSize), io.SeekStart); err != nil {
return err
}
@@ -125,16 +124,24 @@ func index(
hdr, err = tr.Next()
if err != nil {
if err == io.EOF {
// EOF
break
}
return err
continue
}
} else {
return err
break
}
}
if hdr == nil {
// EOF
break
}
if err := indexHeader(record, block, hdr, metadataPersister, compressionFormat); err != nil {
return nil
}

19
cmd/stbak/cmd/recovery_query.go
View File

@@ -47,8 +47,7 @@ var recoveryQueryCmd = &cobra.Command{
for {
hdr, err := tr.Next()
if err != nil {
// Seek right after the next two blocks to skip the trailer
if _, err := f.Seek((controllers.BlockSize * 2), io.SeekCurrent); err == nil {
for {
curr, err := f.Seek(0, io.SeekCurrent)
if err != nil {
return err
@@ -56,7 +55,7 @@ var recoveryQueryCmd = &cobra.Command{
nextTotalBlocks := math.Ceil(float64((curr)) / float64(controllers.BlockSize))
record = int64(nextTotalBlocks) / int64(viper.GetInt(recordSizeFlag))
block = int64(nextTotalBlocks) - (record * int64(viper.GetInt(recordSizeFlag))) - 2
block = int64(nextTotalBlocks) - (record * int64(viper.GetInt(recordSizeFlag)))
if block < 0 {
record--
@@ -76,16 +75,24 @@ var recoveryQueryCmd = &cobra.Command{
hdr, err = tr.Next()
if err != nil {
if err == io.EOF {
// EOF
break
}
return err
continue
}
} else {
return err
break
}
}
if hdr == nil {
// EOF
break
}
if record == 0 && block == 0 {
if err := formatting.PrintCSV(formatting.TARHeaderCSV); err != nil {
return err