lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-08-24 09:01:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename variables

Browse Source
This commit is contained in:
chrislusf 2015-05-23 10:16:01 -07:00
parent d3d23e779a
commit 8f88d382a5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
go/storage/volume.go
View File

@ -24,8 +24,8 @@ type Volume struct {
SuperBlock SuperBlock
accessLock sync.Mutex dataFileAccessLock sync.Mutex
lastModifiedTime uint64 //unix time in seconds lastModifiedTime uint64 //unix time in seconds
} }
func NewVolume(dirname string, collection string, id VolumeId, needleMapKind NeedleMapType, replicaPlacement *ReplicaPlacement, ttl *TTL) (v *Volume, e error) { func NewVolume(dirname string, collection string, id VolumeId, needleMapKind NeedleMapType, replicaPlacement *ReplicaPlacement, ttl *TTL) (v *Volume, e error) {
@ -136,8 +136,8 @@ func (v *Volume) Size() int64 {
// Close cleanly shuts down this volume // Close cleanly shuts down this volume
func (v *Volume) Close() { func (v *Volume) Close() {
v.accessLock.Lock() v.dataFileAccessLock.Lock()
defer v.accessLock.Unlock() defer v.dataFileAccessLock.Unlock()
v.nm.Close() v.nm.Close()
_ = v.dataFile.Close() _ = v.dataFile.Close()
} }
@ -186,8 +186,8 @@ func (v *Volume) write(n *Needle) (size uint32, err error) {
err = fmt.Errorf("%s is read-only", v.dataFile.Name()) err = fmt.Errorf("%s is read-only", v.dataFile.Name())
return return
} }
v.accessLock.Lock() v.dataFileAccessLock.Lock()
defer v.accessLock.Unlock() defer v.dataFileAccessLock.Unlock()
if v.isFileUnchanged(n) { if v.isFileUnchanged(n) {
size = n.DataSize size = n.DataSize
glog.V(4).Infof("needle is unchanged!") glog.V(4).Infof("needle is unchanged!")
@ -231,8 +231,8 @@ func (v *Volume) delete(n *Needle) (uint32, error) {
if v.readOnly { if v.readOnly {
return 0, fmt.Errorf("%s is read-only", v.dataFile.Name()) return 0, fmt.Errorf("%s is read-only", v.dataFile.Name())
} }
v.accessLock.Lock() v.dataFileAccessLock.Lock()
defer v.accessLock.Unlock() defer v.dataFileAccessLock.Unlock()
nv, ok := v.nm.Get(n.Id) nv, ok := v.nm.Get(n.Id)
//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 { if ok {

4
go/storage/volume_vacuum.go
View File

@ -25,8 +25,8 @@ func (v *Volume) Compact() error {
} }
func (v *Volume) commitCompact() error { func (v *Volume) commitCompact() error {
glog.V(3).Infof("Committing vacuuming...") glog.V(3).Infof("Committing vacuuming...")
v.accessLock.Lock() v.dataFileAccessLock.Lock()
defer v.accessLock.Unlock() defer v.dataFileAccessLock.Unlock()
glog.V(3).Infof("Got Committing lock...") glog.V(3).Infof("Got Committing lock...")
_ = v.dataFile.Close() _ = v.dataFile.Close()
var e error var e error