diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-11-27 03:17:10 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-11-27 03:17:10 -0800 |
| commit | 6d30b21b10260c8c0f2c9f665a3d907494566092 (patch) | |
| tree | b2509c87ee0cb5eb373d8c3fabc4fd1ac53c7af5 /weed/storage/volume_backup.go | |
| parent | 3c229eb677a9aedd4e59f511f10aa4ba552f821b (diff) | |
| download | seaweedfs-6d30b21b10260c8c0f2c9f665a3d907494566092.tar.xz seaweedfs-6d30b21b10260c8c0f2c9f665a3d907494566092.zip | |
volume: add "-dir.idx" option for separate index storage
fix https://github.com/chrislusf/seaweedfs/issues/1265
Diffstat (limited to 'weed/storage/volume_backup.go')
| -rw-r--r-- | weed/storage/volume_backup.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/weed/storage/volume_backup.go b/weed/storage/volume_backup.go index 595bd8a35..62004d4da 100644 --- a/weed/storage/volume_backup.go +++ b/weed/storage/volume_backup.go @@ -124,9 +124,9 @@ func (v *Volume) findLastAppendAtNs() (uint64, error) { } func (v *Volume) locateLastAppendEntry() (Offset, error) { - indexFile, e := os.OpenFile(v.FileName()+".idx", os.O_RDONLY, 0644) + indexFile, e := os.OpenFile(v.FileName(".idx"), os.O_RDONLY, 0644) if e != nil { - return Offset{}, fmt.Errorf("cannot read %s.idx: %v", v.FileName(), e) + return Offset{}, fmt.Errorf("cannot read %s: %v", v.FileName(".idx"), e) } defer indexFile.Close() @@ -156,9 +156,9 @@ func (v *Volume) readAppendAtNs(offset Offset) (uint64, error) { n, _, bodyLength, err := needle.ReadNeedleHeader(v.DataBackend, v.SuperBlock.Version, offset.ToAcutalOffset()) if err != nil { - return 0, fmt.Errorf("ReadNeedleHeader: %v", err) + return 0, fmt.Errorf("ReadNeedleHeader %s [%d,%d): %v", v.DataBackend.Name(), offset.ToAcutalOffset(), offset.ToAcutalOffset()+NeedleHeaderSize, err) } - _, err = n.ReadNeedleBody(v.DataBackend, v.SuperBlock.Version, offset.ToAcutalOffset()+int64(NeedleHeaderSize), bodyLength) + _, err = n.ReadNeedleBody(v.DataBackend, v.SuperBlock.Version, offset.ToAcutalOffset()+NeedleHeaderSize, bodyLength) if err != nil { return 0, fmt.Errorf("ReadNeedleBody offset %d, bodyLength %d: %v", offset.ToAcutalOffset(), bodyLength, err) } @@ -168,9 +168,9 @@ func (v *Volume) readAppendAtNs(offset Offset) (uint64, error) { // on server side func (v *Volume) BinarySearchByAppendAtNs(sinceNs uint64) (offset Offset, isLast bool, err error) { - indexFile, openErr := os.OpenFile(v.FileName()+".idx", os.O_RDONLY, 0644) + indexFile, openErr := os.OpenFile(v.FileName(".idx"), os.O_RDONLY, 0644) if openErr != nil { - err = fmt.Errorf("cannot read %s.idx: %v", v.FileName(), openErr) + err = fmt.Errorf("cannot read %s: %v", v.FileName(".idx"), openErr) return } defer indexFile.Close() |