mirror of
https://github.com/chrislusf/seaweedfs
synced 2024-07-02 07:06:44 +02:00
Remove obsolete property Volume.dataFileSize
This commit is contained in:
parent
e074a54a20
commit
4fb5bb09b6
|
@ -54,10 +54,6 @@ func (l *DiskLocation) loadExistingVolume(dir os.FileInfo, needleMapKind NeedleM
|
||||||
mutex.Unlock()
|
mutex.Unlock()
|
||||||
glog.V(0).Infof("data file %s, replicaPlacement=%s v=%d size=%d ttl=%s",
|
glog.V(0).Infof("data file %s, replicaPlacement=%s v=%d size=%d ttl=%s",
|
||||||
l.Directory+"/"+name, v.ReplicaPlacement, v.Version(), v.Size(), v.Ttl.String())
|
l.Directory+"/"+name, v.ReplicaPlacement, v.Version(), v.Size(), v.Ttl.String())
|
||||||
if v.Size() != v.dataFileSize {
|
|
||||||
glog.V(0).Infof("data file %s, size=%d expected=%d",
|
|
||||||
l.Directory+"/"+name, v.Size(), v.dataFileSize)
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
glog.V(0).Infof("new volume %s error %s", name, e)
|
glog.V(0).Infof("new volume %s error %s", name, e)
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,6 @@ type Volume struct {
|
||||||
dir string
|
dir string
|
||||||
Collection string
|
Collection string
|
||||||
dataFile *os.File
|
dataFile *os.File
|
||||||
dataFileSize int64
|
|
||||||
nm NeedleMapper
|
nm NeedleMapper
|
||||||
needleMapKind NeedleMapType
|
needleMapKind NeedleMapType
|
||||||
readOnly bool
|
readOnly bool
|
||||||
|
|
|
@ -64,7 +64,7 @@ func (v *Volume) load(alsoLoadIndex bool, createDatIfMissing bool, needleMapKind
|
||||||
return fmt.Errorf("cannot write Volume Index %s.idx: %v", fileName, e)
|
return fmt.Errorf("cannot write Volume Index %s.idx: %v", fileName, e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if v.dataFileSize, e = CheckVolumeDataIntegrity(v, indexFile); e != nil {
|
if _, e = CheckVolumeDataIntegrity(v, indexFile); e != nil {
|
||||||
v.readOnly = true
|
v.readOnly = true
|
||||||
glog.V(0).Infof("volumeDataIntegrityChecking failed %v", e)
|
glog.V(0).Infof("volumeDataIntegrityChecking failed %v", e)
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,8 +60,6 @@ func (v *Volume) AppendBlob(b []byte) (offset int64, err error) {
|
||||||
if offset, err = v.dataFile.Seek(0, 2); err != nil {
|
if offset, err = v.dataFile.Seek(0, 2); err != nil {
|
||||||
glog.V(0).Infof("failed to seek the end of file: %v", err)
|
glog.V(0).Infof("failed to seek the end of file: %v", err)
|
||||||
return
|
return
|
||||||
} else if offset != int64(v.dataFileSize) {
|
|
||||||
glog.V(0).Infof("dataFileSize %d != actual data file size: %d, volumeId: %v", v.dataFileSize, offset, v.Id)
|
|
||||||
}
|
}
|
||||||
//ensure file writing starting from aligned positions
|
//ensure file writing starting from aligned positions
|
||||||
if offset%NeedlePaddingSize != 0 {
|
if offset%NeedlePaddingSize != 0 {
|
||||||
|
@ -69,12 +67,9 @@ func (v *Volume) AppendBlob(b []byte) (offset int64, err error) {
|
||||||
if offset, err = v.dataFile.Seek(offset, 0); err != nil {
|
if offset, err = v.dataFile.Seek(offset, 0); err != nil {
|
||||||
glog.V(0).Infof("failed to align in datafile %s: %v", v.dataFile.Name(), err)
|
glog.V(0).Infof("failed to align in datafile %s: %v", v.dataFile.Name(), err)
|
||||||
return
|
return
|
||||||
} else if offset != int64(v.dataFileSize) {
|
|
||||||
glog.V(0).Infof("dataFileSize %d != actual data file size: %d, volumeId: %v", v.dataFileSize, offset, v.Id)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_, err = v.dataFile.Write(b)
|
_, err = v.dataFile.Write(b)
|
||||||
v.dataFileSize += int64(len(b))
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -91,12 +86,10 @@ func (v *Volume) writeNeedle(n *Needle) (size uint32, err error) {
|
||||||
glog.V(4).Infof("needle is unchanged!")
|
glog.V(4).Infof("needle is unchanged!")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
var offset, actualSize int64
|
var offset int64
|
||||||
if offset, err = v.dataFile.Seek(0, 2); err != nil {
|
if offset, err = v.dataFile.Seek(0, 2); err != nil {
|
||||||
glog.V(0).Infof("failed to seek the end of file: %v", err)
|
glog.V(0).Infof("failed to seek the end of file: %v", err)
|
||||||
return
|
return
|
||||||
} else if offset != int64(v.dataFileSize) {
|
|
||||||
glog.V(0).Infof("dataFileSize %d != actual data file size: %d, volumeId: %v", v.dataFileSize, offset, v.Id)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//ensure file writing starting from aligned positions
|
//ensure file writing starting from aligned positions
|
||||||
|
@ -108,13 +101,12 @@ func (v *Volume) writeNeedle(n *Needle) (size uint32, err error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if size, actualSize, err = n.Append(v.dataFile, v.Version()); err != nil {
|
if size, _, err = n.Append(v.dataFile, v.Version()); err != nil {
|
||||||
if e := v.dataFile.Truncate(offset); e != nil {
|
if e := v.dataFile.Truncate(offset); e != nil {
|
||||||
err = fmt.Errorf("%s\ncannot truncate %s: %v", err, v.dataFile.Name(), e)
|
err = fmt.Errorf("%s\ncannot truncate %s: %v", err, v.dataFile.Name(), e)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
v.dataFileSize += actualSize
|
|
||||||
|
|
||||||
nv, ok := v.nm.Get(n.Id)
|
nv, ok := v.nm.Get(n.Id)
|
||||||
if !ok || int64(nv.Offset)*NeedlePaddingSize < offset {
|
if !ok || int64(nv.Offset)*NeedlePaddingSize < offset {
|
||||||
|
@ -139,18 +131,15 @@ func (v *Volume) deleteNeedle(n *Needle) (uint32, error) {
|
||||||
//fmt.Println("key", n.Id, "volume offset", nv.Offset, "data_size", n.Size, "cached size", nv.Size)
|
//fmt.Println("key", n.Id, "volume offset", nv.Offset, "data_size", n.Size, "cached size", nv.Size)
|
||||||
if ok && nv.Size != TombstoneFileSize {
|
if ok && nv.Size != TombstoneFileSize {
|
||||||
size := nv.Size
|
size := nv.Size
|
||||||
// println("adding tombstone", n.Id, "at offset", v.dataFileSize)
|
offset, err := v.dataFile.Seek(0, 2)
|
||||||
if err := v.nm.Delete(n.Id, uint32(v.dataFileSize/NeedlePaddingSize)); err != nil {
|
if err != nil {
|
||||||
return size, err
|
return size, err
|
||||||
}
|
}
|
||||||
if offset, err := v.dataFile.Seek(0, 2); err != nil {
|
if err := v.nm.Delete(n.Id, uint32(offset/NeedlePaddingSize)); err != nil {
|
||||||
return size, err
|
return size, err
|
||||||
} else if offset != int64(v.dataFileSize) {
|
|
||||||
glog.V(0).Infof("dataFileSize %d != actual data file size: %d, deleteMarker: %d, volumeId: %v", v.dataFileSize, offset, getActualSize(0), v.Id)
|
|
||||||
}
|
}
|
||||||
n.Data = nil
|
n.Data = nil
|
||||||
_, actualSize, err := n.Append(v.dataFile, v.Version())
|
_, _, err = n.Append(v.dataFile, v.Version())
|
||||||
v.dataFileSize += actualSize
|
|
||||||
return size, err
|
return size, err
|
||||||
}
|
}
|
||||||
return 0, nil
|
return 0, nil
|
||||||
|
|
|
@ -56,7 +56,6 @@ func (v *Volume) maybeWriteSuperBlock() error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
v.dataFileSize = SuperBlockSize
|
|
||||||
}
|
}
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@ func (v *Volume) Compact() error {
|
||||||
v.lastCompactIndexOffset = v.nm.IndexFileSize()
|
v.lastCompactIndexOffset = v.nm.IndexFileSize()
|
||||||
v.lastCompactRevision = v.SuperBlock.CompactRevision
|
v.lastCompactRevision = v.SuperBlock.CompactRevision
|
||||||
glog.V(3).Infof("creating copies for volume %d ,last offset %d...", v.Id, v.lastCompactIndexOffset)
|
glog.V(3).Infof("creating copies for volume %d ,last offset %d...", v.Id, v.lastCompactIndexOffset)
|
||||||
return v.copyDataAndGenerateIndexFile(filePath+".cpd", filePath+".cpx", v.dataFileSize)
|
return v.copyDataAndGenerateIndexFile(filePath+".cpd", filePath+".cpx", 0)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (v *Volume) Compact2() error {
|
func (v *Volume) Compact2() error {
|
||||||
|
|
Loading…
Reference in a new issue