add lock variable

weed/server/volume_server_handlers_admin.go

@@ -12,7 +12,7 @@ import (
 func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) {
 	m := make(map[string]interface{})
 	m["Version"] = util.VERSION
-	m["Volumes"] = vs.store.Status()
+	m["Volumes"] = vs.store.VolumeInfos()
 	writeJsonQuiet(w, r, http.StatusOK, m)
 }
 

weed/server/volume_server_handlers_ui.go

@@ -31,7 +31,7 @@ func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request)
 	}{
 		util.VERSION,
 		vs.SeedMasterNodes,
-		vs.store.Status(),
+		vs.store.VolumeInfos(),
 		vs.store.EcVolumes(),
 		ds,
 		infos,

weed/storage/disk_location.go

@@ -17,7 +17,7 @@ type DiskLocation struct {
 	Directory      string
 	MaxVolumeCount int
 	volumes        map[needle.VolumeId]*Volume
-	sync.RWMutex
+	volumesLock    sync.RWMutex
 
 	// erasure coding
 	ecVolumes     map[needle.VolumeId]*erasure_coding.EcVolume
@@ -56,14 +56,14 @@ func (l *DiskLocation) loadExistingVolume(fileInfo os.FileInfo, needleMapKind Ne
 	if !fileInfo.IsDir() && strings.HasSuffix(name, ".idx") {
 		vid, collection, err := l.volumeIdFromPath(fileInfo)
 		if err == nil {
-			l.RLock()
+			l.volumesLock.RLock()
 			_, found := l.volumes[vid]
-			l.RUnlock()
+			l.volumesLock.RUnlock()
 			if !found {
 				if v, e := NewVolume(l.Directory, collection, vid, needleMapKind, nil, nil, 0, 0); e == nil {
-					l.Lock()
+					l.volumesLock.Lock()
 					l.volumes[vid] = v
-					l.Unlock()
+					l.volumesLock.Unlock()
 					size, _, _ := v.FileStat()
 					glog.V(0).Infof("data file %s, replicaPlacement=%s v=%d size=%d ttl=%s",
 						l.Directory+"/"+name, v.ReplicaPlacement, v.Version(), size, v.Ttl.String())
@@ -115,17 +115,17 @@ func (l *DiskLocation) loadExistingVolumes(needleMapKind NeedleMapType) {
 
 func (l *DiskLocation) DeleteCollectionFromDiskLocation(collection string) (e error) {
 
-	l.Lock()
+	l.volumesLock.Lock()
 	for k, v := range l.volumes {
 		if v.Collection == collection {
 			e = l.deleteVolumeById(k)
 			if e != nil {
-				l.Unlock()
+				l.volumesLock.Unlock()
 				return
 			}
 		}
 	}
-	l.Unlock()
+	l.volumesLock.Unlock()
 
 	l.ecVolumesLock.Lock()
 	for k, v := range l.ecVolumes {
@@ -170,8 +170,8 @@ func (l *DiskLocation) LoadVolume(vid needle.VolumeId, needleMapKind NeedleMapTy
 }
 
 func (l *DiskLocation) DeleteVolume(vid needle.VolumeId) error {
-	l.Lock()
+	l.volumesLock.Lock()
-	defer l.Unlock()
+	defer l.volumesLock.Unlock()
 
 	_, ok := l.volumes[vid]
 	if !ok {
@@ -181,8 +181,8 @@ func (l *DiskLocation) DeleteVolume(vid needle.VolumeId) error {
 }
 
 func (l *DiskLocation) UnloadVolume(vid needle.VolumeId) error {
-	l.Lock()
+	l.volumesLock.Lock()
-	defer l.Unlock()
+	defer l.volumesLock.Unlock()
 
 	v, ok := l.volumes[vid]
 	if !ok {
@@ -194,33 +194,33 @@ func (l *DiskLocation) UnloadVolume(vid needle.VolumeId) error {
 }
 
 func (l *DiskLocation) SetVolume(vid needle.VolumeId, volume *Volume) {
-	l.Lock()
+	l.volumesLock.Lock()
-	defer l.Unlock()
+	defer l.volumesLock.Unlock()
 
 	l.volumes[vid] = volume
 }
 
 func (l *DiskLocation) FindVolume(vid needle.VolumeId) (*Volume, bool) {
-	l.RLock()
+	l.volumesLock.RLock()
-	defer l.RUnlock()
+	defer l.volumesLock.RUnlock()
 
 	v, ok := l.volumes[vid]
 	return v, ok
 }
 
 func (l *DiskLocation) VolumesLen() int {
-	l.RLock()
+	l.volumesLock.RLock()
-	defer l.RUnlock()
+	defer l.volumesLock.RUnlock()
 
 	return len(l.volumes)
 }
 
 func (l *DiskLocation) Close() {
-	l.Lock()
+	l.volumesLock.Lock()
 	for _, v := range l.volumes {
 		v.Close()
 	}
-	l.Unlock()
+	l.volumesLock.Unlock()
 
 	l.ecVolumesLock.Lock()
 	for _, ecVolume := range l.ecVolumes {

weed/storage/store.go

@@ -126,10 +126,10 @@ func (s *Store) addVolume(vid needle.VolumeId, collection string, needleMapKind
 	return fmt.Errorf("No more free space left")
 }
 
-func (s *Store) Status() []*VolumeInfo {
+func (s *Store) VolumeInfos() []*VolumeInfo {
 	var stats []*VolumeInfo
 	for _, location := range s.Locations {
-		location.RLock()
+		location.volumesLock.RLock()
 		for k, v := range location.volumes {
 			s := &VolumeInfo{
 				Id:               needle.VolumeId(k),
@@ -146,7 +146,7 @@ func (s *Store) Status() []*VolumeInfo {
 			}
 			stats = append(stats, s)
 		}
-		location.RUnlock()
+		location.volumesLock.RUnlock()
 	}
 	sortVolumeInfos(stats)
 	return stats
@@ -167,7 +167,7 @@ func (s *Store) CollectHeartbeat() *master_pb.Heartbeat {
 	for _, location := range s.Locations {
 		var deleteVids []needle.VolumeId
 		maxVolumeCount = maxVolumeCount + location.MaxVolumeCount
-		location.RLock()
+		location.volumesLock.RLock()
 		for _, v := range location.volumes {
 			if maxFileKey < v.MaxFileKey() {
 				maxFileKey = v.MaxFileKey()
@@ -184,16 +184,16 @@ func (s *Store) CollectHeartbeat() *master_pb.Heartbeat {
 			fileSize, _, _ := v.FileStat()
 			collectionVolumeSize[v.Collection] += fileSize
 		}
-		location.RUnlock()
+		location.volumesLock.RUnlock()
 
 		if len(deleteVids) > 0 {
 			// delete expired volumes.
-			location.Lock()
+			location.volumesLock.Lock()
 			for _, vid := range deleteVids {
 				location.deleteVolumeById(vid)
 				glog.V(0).Infoln("volume", vid, "is deleted.")
 			}
-			location.Unlock()
+			location.volumesLock.Unlock()
 		}
 	}