diff options
| -rw-r--r-- | weed-fs/src/cmd/weed/master.go | 4 | ||||
| -rw-r--r-- | weed-fs/src/pkg/directory/volume_mapping.go | 6 | ||||
| -rw-r--r-- | weed-fs/src/pkg/storage/store.go | 15 |
3 files changed, 11 insertions, 14 deletions
diff --git a/weed-fs/src/cmd/weed/master.go b/weed-fs/src/cmd/weed/master.go index e6af3809a..74429d360 100644 --- a/weed-fs/src/cmd/weed/master.go +++ b/weed-fs/src/cmd/weed/master.go @@ -5,7 +5,7 @@ import ( "encoding/json" "log" "net/http" - "pkg/storage" + "pkg/topology" "strconv" "strings" ) @@ -60,7 +60,7 @@ func dirAssignHandler(w http.ResponseWriter, r *http.Request) { func dirJoinHandler(w http.ResponseWriter, r *http.Request) { s := r.RemoteAddr[0:strings.Index(r.RemoteAddr, ":")+1] + r.FormValue("port") publicUrl := r.FormValue("publicUrl") - volumes := new([]storage.VolumeInfo) + volumes := new([]topology.VolumeInfo) json.Unmarshal([]byte(r.FormValue("volumes")), volumes) if *IsDebug { log.Println(s, "volumes", r.FormValue("volumes")) diff --git a/weed-fs/src/pkg/directory/volume_mapping.go b/weed-fs/src/pkg/directory/volume_mapping.go index 114f212e2..0fb6c6a59 100644 --- a/weed-fs/src/pkg/directory/volume_mapping.go +++ b/weed-fs/src/pkg/directory/volume_mapping.go @@ -7,7 +7,7 @@ import ( "math/rand" "os" "path" - "pkg/storage" + "pkg/topology" "strconv" "sync" ) @@ -22,7 +22,7 @@ type MachineInfo struct { } type Machine struct { Server MachineInfo - Volumes []storage.VolumeInfo + Volumes []topology.VolumeInfo } type Mapper struct { @@ -41,7 +41,7 @@ type Mapper struct { volumeSizeLimit uint64 } -func NewMachine(server, publicUrl string, volumes []storage.VolumeInfo) *Machine { +func NewMachine(server, publicUrl string, volumes []topology.VolumeInfo) *Machine { return &Machine{Server: MachineInfo{Url: server, PublicUrl: publicUrl}, Volumes: volumes} } diff --git a/weed-fs/src/pkg/storage/store.go b/weed-fs/src/pkg/storage/store.go index e5cbd546b..93907c079 100644 --- a/weed-fs/src/pkg/storage/store.go +++ b/weed-fs/src/pkg/storage/store.go @@ -7,6 +7,7 @@ import ( "net/url" "strconv" "strings" + "pkg/topology" "pkg/util" ) @@ -16,10 +17,6 @@ type Store struct { Port int PublicUrl string } -type VolumeInfo struct { - Id uint32 - Size int64 -} func NewStore(port int, publicUrl, dirname string, volumeListString string) (s *Store) { s = &Store{Port: port, PublicUrl: publicUrl, dir: dirname} @@ -63,19 +60,19 @@ func (s *Store) addVolume(vid uint64) error { s.volumes[vid] = NewVolume(s.dir, uint32(vid)) return nil } -func (s *Store) Status() *[]*VolumeInfo { - stats := new([]*VolumeInfo) +func (s *Store) Status() *[]*topology.VolumeInfo { + stats := new([]*topology.VolumeInfo) for k, v := range s.volumes { - s := new(VolumeInfo) + s := new(topology.VolumeInfo) s.Id, s.Size = uint32(k), v.Size() *stats = append(*stats, s) } return stats } func (s *Store) Join(mserver string) { - stats := new([]*VolumeInfo) + stats := new([]*topology.VolumeInfo) for k, v := range s.volumes { - s := new(VolumeInfo) + s := new(topology.VolumeInfo) s.Id, s.Size = uint32(k), v.Size() *stats = append(*stats, s) } |