diff options
| author | chrislusf <chris.lu@gmail.com> | 2014-12-26 01:29:30 -0800 |
|---|---|---|
| committer | chrislusf <chris.lu@gmail.com> | 2014-12-26 01:29:30 -0800 |
| commit | 763f5e16c7238b8e4b30ea60560212fb927a8873 (patch) | |
| tree | ec86ea79cb296d838a5d8eaa71ec7a30705e6d90 /go/storage/volume.go | |
| parent | 8651f7c7276042332fb3edf545f7a7a3af3e0dec (diff) | |
| parent | 5b7628cf08b246bb8dd075a28f29e1bd3401eb2d (diff) | |
| download | seaweedfs-763f5e16c7238b8e4b30ea60560212fb927a8873.tar.xz seaweedfs-763f5e16c7238b8e4b30ea60560212fb927a8873.zip | |
Merge pull request #38 from aszxqw/master
fix
Diffstat (limited to 'go/storage/volume.go')
| -rw-r--r-- | go/storage/volume.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/go/storage/volume.go b/go/storage/volume.go index 5b0a83605..a1eccd62c 100644 --- a/go/storage/volume.go +++ b/go/storage/volume.go @@ -33,6 +33,10 @@ func NewVolume(dirname string, collection string, id VolumeId, replicaPlacement e = v.load(true, true) return } +func (v *Volume) String() string { + return fmt.Sprintf("Id:%v, dir:%s, Collection:%s, dataFile:%v, nm:%v, readOnly:%v", v.Id, v.dir, v.Collection, v.dataFile, v.nm, v.readOnly) +} + func loadVolumeWithoutIndex(dirname string, collection string, id VolumeId) (v *Volume, e error) { v = &Volume{dir: dirname, Collection: collection, Id: id} v.SuperBlock = SuperBlock{} @@ -135,7 +139,7 @@ func (v *Volume) isFileUnchanged(n *Needle) bool { oldNeedle := new(Needle) oldNeedle.Read(v.dataFile, int64(nv.Offset)*NeedlePaddingSize, nv.Size, v.Version()) if oldNeedle.Checksum == n.Checksum && bytes.Equal(oldNeedle.Data, n.Data) { - n.Size = oldNeedle.Size + n.DataSize = oldNeedle.DataSize return true } } @@ -165,7 +169,7 @@ func (v *Volume) write(n *Needle) (size uint32, err error) { v.accessLock.Lock() defer v.accessLock.Unlock() if v.isFileUnchanged(n) { - size = n.Size + size = n.DataSize glog.V(4).Infof("needle is unchanged!") return } |
