separate into 2 files, no logic change

go/storage/disk_location.go

@@ -0,0 +1,44 @@
+package storage
+
+import (
+	"io/ioutil"
+	"strings"
+
+	"github.com/chrislusf/seaweedfs/go/glog"
+)
+
+type DiskLocation struct {
+	Directory      string
+	MaxVolumeCount int
+	volumes        map[VolumeId]*Volume
+}
+
+func (mn *DiskLocation) reset() {
+}
+
+func (l *DiskLocation) loadExistingVolumes(needleMapKind NeedleMapType) {
+	if dirs, err := ioutil.ReadDir(l.Directory); err == nil {
+		for _, dir := range dirs {
+			name := dir.Name()
+			if !dir.IsDir() && strings.HasSuffix(name, ".dat") {
+				collection := ""
+				base := name[:len(name)-len(".dat")]
+				i := strings.LastIndex(base, "_")
+				if i > 0 {
+					collection, base = base[0:i], base[i+1:]
+				}
+				if vid, err := NewVolumeId(base); err == nil {
+					if l.volumes[vid] == nil {
+						if v, e := NewVolume(l.Directory, collection, vid, needleMapKind, nil, nil); e == nil {
+							l.volumes[vid] = v
+							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())
+						} else {
+							glog.V(0).Infof("new volume %s error %s", name, e)
+						}
+					}
+				}
+			}
+		}
+	}
+	glog.V(0).Infoln("Store started on dir:", l.Directory, "with", len(l.volumes), "volumes", "max", l.MaxVolumeCount)
+}

go/storage/store.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"strconv"
 	"strings"
@@ -20,15 +19,6 @@ const (
 	MAX_TTL_VOLUME_REMOVAL_DELAY = 10 // 10 minutes
 )
 
-type DiskLocation struct {
-	Directory      string
-	MaxVolumeCount int
-	volumes        map[VolumeId]*Volume
-}
-
-func (mn *DiskLocation) reset() {
-}
-
 type MasterNodes struct {
 	nodes    []string
 	lastNode int
@@ -200,32 +190,6 @@ func (s *Store) addVolume(vid VolumeId, collection string, needleMapKind NeedleM
 	return fmt.Errorf("No more free space left")
 }
 
-func (l *DiskLocation) loadExistingVolumes(needleMapKind NeedleMapType) {
-	if dirs, err := ioutil.ReadDir(l.Directory); err == nil {
-		for _, dir := range dirs {
-			name := dir.Name()
-			if !dir.IsDir() && strings.HasSuffix(name, ".dat") {
-				collection := ""
-				base := name[:len(name)-len(".dat")]
-				i := strings.LastIndex(base, "_")
-				if i > 0 {
-					collection, base = base[0:i], base[i+1:]
-				}
-				if vid, err := NewVolumeId(base); err == nil {
-					if l.volumes[vid] == nil {
-						if v, e := NewVolume(l.Directory, collection, vid, needleMapKind, nil, nil); e == nil {
-							l.volumes[vid] = v
-							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())
-						} else {
-							glog.V(0).Infof("new volume %s error %s", name, e)
-						}
-					}
-				}
-			}
-		}
-	}
-	glog.V(0).Infoln("Store started on dir:", l.Directory, "with", len(l.volumes), "volumes", "max", l.MaxVolumeCount)
-}
 func (s *Store) Status() []*VolumeInfo {
 	var stats []*VolumeInfo
 	for _, location := range s.Locations {